Skip to content
Snippets Groups Projects
Verified Commit fba26fd1 authored by Olivier Benz's avatar Olivier Benz
Browse files

Update handling of timezone setting

parent 7613c7e9
Branches
No related tags found
No related merge requests found
...@@ -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
......
...@@ -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
......
...@@ -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 |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment