From fba26fd175dd341b93d30f57d67f3fc3696d03a8 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Sat, 17 Aug 2024 15:39:29 +0200
Subject: [PATCH] Update handling of timezone setting
---
.devcontainer/GHC-legacy.Dockerfile | 9 +++++----
.devcontainer/GHC.Dockerfile | 9 +++++----
VERSION_MATRIX.md | 6 +++---
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/.devcontainer/GHC-legacy.Dockerfile b/.devcontainer/GHC-legacy.Dockerfile
index e9925b7..7fe90a7 100644
--- a/.devcontainer/GHC-legacy.Dockerfile
+++ b/.devcontainer/GHC-legacy.Dockerfile
@@ -74,10 +74,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
## Update timezone if needed
&& if [ "$TZ" != "" ]; then \
apk add --no-cache tzdata; \
- echo "Setting TZ to $TZ"; \
- ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
- && echo "$TZ" > /etc/timezone; \
fi \
+ ## Info about timezone
+ && echo "TZ is set to $TZ" \
## Add/Update locale if needed
&& if [ "$LANG" != "C.UTF-8" ]; then \
if [ -n "$LANG" ]; 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/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
## Install Stack
diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile
index 77fbb2b..cce8667 100644
--- a/.devcontainer/GHC.Dockerfile
+++ b/.devcontainer/GHC.Dockerfile
@@ -72,10 +72,9 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
## Update timezone if needed
&& if [ "$TZ" != "" ]; then \
apk add --no-cache tzdata; \
- echo "Setting TZ to $TZ"; \
- ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime \
- && echo "$TZ" > /etc/timezone; \
fi \
+ ## Info about timezone
+ && echo "TZ is set to $TZ" \
## Add/Update locale if needed
&& if [ "$LANG" != "C.UTF-8" ]; then \
if [ -n "$LANG" ]; 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/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
## Install HLS
diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md
index 8019400..d72c98f 100644
--- a/VERSION_MATRIX.md
+++ b/VERSION_MATRIX.md
@@ -4,10 +4,10 @@ Topmost entry = Tag `latest`
| GHC | Cabal | Stack | LLVM | Linux distro |
|:-----------|:---------|:-----------|:---- |:-------------|
-| 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.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.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.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 |
--
GitLab