Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GHC musl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
GHC musl
Commits
fba26fd1
Verified
Commit
fba26fd1
authored
8 months ago
by
Olivier Benz
Browse files
Options
Downloads
Patches
Plain Diff
Update handling of timezone setting
parent
7613c7e9
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.devcontainer/GHC-legacy.Dockerfile
+5
-4
5 additions, 4 deletions
.devcontainer/GHC-legacy.Dockerfile
.devcontainer/GHC.Dockerfile
+5
-4
5 additions, 4 deletions
.devcontainer/GHC.Dockerfile
VERSION_MATRIX.md
+3
-3
3 additions, 3 deletions
VERSION_MATRIX.md
with
13 additions
and
11 deletions
.devcontainer/GHC-legacy.Dockerfile
+
5
−
4
View file @
fba26fd1
...
@@ -74,10 +74,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
...
@@ -74,10 +74,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
## Update timezone if needed
## Update timezone if needed
&& if [ "$TZ" != "" ]; then \
&& if [ "$TZ" != "" ]; then \
apk add --no-cache tzdata; \
apk add --no-cache tzdata; \
echo "Setting TZ to $TZ"; \
ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
&& echo "$TZ" > /etc/timezone; \
fi \
fi \
## Info about timezone
&& echo "TZ is set to $TZ" \
## Add/Update locale if needed
## Add/Update locale if needed
&& if [ "$LANG" != "C.UTF-8" ]; then \
&& if [ "$LANG" != "C.UTF-8" ]; then \
if [ -n "$LANG" ]; then \
if [ -n "$LANG" ]; then \
...
@@ -87,7 +86,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
...
@@ -87,7 +86,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
fi
fi \
## Info about locale
&& echo "LANG is set to $LANG"
## Copy binaries as late as possible to avoid cache busting
## Copy binaries as late as possible to avoid cache busting
## Install Stack
## Install Stack
...
...
This diff is collapsed.
Click to expand it.
.devcontainer/GHC.Dockerfile
+
5
−
4
View file @
fba26fd1
...
@@ -72,10 +72,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
...
@@ -72,10 +72,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
## Update timezone if needed
## Update timezone if needed
&& if [ "$TZ" != "" ]; then \
&& if [ "$TZ" != "" ]; then \
apk add --no-cache tzdata; \
apk add --no-cache tzdata; \
echo "Setting TZ to $TZ"; \
ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
&& echo "$TZ" > /etc/timezone; \
fi \
fi \
## Info about timezone
&& echo "TZ is set to $TZ" \
## Add/Update locale if needed
## Add/Update locale if needed
&& if [ "$LANG" != "C.UTF-8" ]; then \
&& if [ "$LANG" != "C.UTF-8" ]; then \
if [ -n "$LANG" ]; then \
if [ -n "$LANG" ]; then \
...
@@ -85,7 +84,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
...
@@ -85,7 +84,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LANG:-C.UTF-8/LANG:-$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE=C/LC_COLLATE=$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
sed -i "s/LC_COLLATE:-C/LC_COLLATE:-$LANG/" /etc/profile.d/*locale.sh; \
fi
fi \
## Info about locale
&& echo "LANG is set to $LANG"
## Copy binaries as late as possible to avoid cache busting
## Copy binaries as late as possible to avoid cache busting
## Install HLS
## Install HLS
...
...
This diff is collapsed.
Click to expand it.
VERSION_MATRIX.md
+
3
−
3
View file @
fba26fd1
...
@@ -4,10 +4,10 @@ Topmost entry = Tag `latest`
...
@@ -4,10 +4,10 @@ Topmost entry = Tag `latest`
| GHC | Cabal | Stack | LLVM | Linux distro |
| GHC | Cabal | Stack | LLVM | Linux distro |
|:-----------|:---------|:-----------|:---- |:-------------|
|:-----------|:---------|:-----------|:---- |:-------------|
| 9.10.1 | 3.12.1.0 | 3.1.1 | 18 | Alpine 3.20 |
| 9.10.1 | 3.12.1.0 | 3.1.1
| 18 | Alpine 3.20 |
| 9.8.2 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.20 |
| 9.8.2 | 3.10.3.0 | 3.1.1
| 16 | Alpine 3.20 |
| 9.8.1 | 3.10.2.1 | 2.15.1 | 14 | Alpine 3.19 |
| 9.8.1 | 3.10.2.1 | 2.15.1 | 14 | Alpine 3.19 |
| 9.6.6 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.20 |
| 9.6.6 | 3.10.3.0 | 3.1.1
| 16 | Alpine 3.20 |
| 9.6.5 | 3.10.3.0 | 2.15.7 | 16 | Alpine 3.20 |
| 9.6.5 | 3.10.3.0 | 2.15.7 | 16 | Alpine 3.20 |
| 9.6.4 | 3.10.3.0 | 2.15.5 | 14 | Alpine 3.19 |
| 9.6.4 | 3.10.3.0 | 2.15.5 | 14 | Alpine 3.19 |
| 9.6.3 | 3.10.1.0 | 2.13.1 | 14 | Alpine 3.19 |
| 9.6.3 | 3.10.1.0 | 2.13.1 | 14 | Alpine 3.19 |
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment