From 7621695049ae68c6d1271723d404ac82fc43c380 Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Sun, 30 Mar 2025 14:57:22 +0200
Subject: [PATCH] Dev Containers: Rename variables for setting LANG and TZ
---
.devcontainer/Dockerfile | 11 +++++++----
.devcontainer/GHC-legacy.Dockerfile | 11 +++++++----
.devcontainer/GHC.Dockerfile | 11 +++++++----
.devcontainer/devcontainer.json | 4 ++--
.devcontainer/ghc-9.10/devcontainer.json | 4 ++--
.devcontainer/ghc-9.12/devcontainer.json | 4 ++--
.devcontainer/ghc-9.6/devcontainer.json | 4 ++--
.devcontainer/ghc-9.8/devcontainer.json | 4 ++--
8 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 53815a3..a9eef9e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -51,11 +51,14 @@ RUN dpkgArch="$(dpkg --print-architecture)" \
## Update environment
ARG USE_ZSH_FOR_ROOT
-ARG SET_LANG
-ARG SET_TZ
+ARG LANG
+ARG TZ
-ENV LANG=${SET_LANG:-$LANG} \
- TZ=${SET_TZ:-$TZ}
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+ TZ=${TZ_OVERRIDE:-$TZ}
## Change root's shell to ZSH
RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
diff --git a/.devcontainer/GHC-legacy.Dockerfile b/.devcontainer/GHC-legacy.Dockerfile
index 293e931..7b4f364 100644
--- a/.devcontainer/GHC-legacy.Dockerfile
+++ b/.devcontainer/GHC-legacy.Dockerfile
@@ -59,11 +59,14 @@ RUN sysArch="$(uname -m)" \
## Update environment
ARG USE_ZSH_FOR_ROOT
-ARG SET_LANG
-ARG SET_TZ
+ARG LANG
+ARG TZ
-ENV TZ=${SET_TZ:-$TZ} \
- LANG=${SET_LANG:-$LANG}
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+ TZ=${TZ_OVERRIDE:-$TZ}
## Change root's shell to ZSH
RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
diff --git a/.devcontainer/GHC.Dockerfile b/.devcontainer/GHC.Dockerfile
index 4e0e9f4..ac36cd5 100644
--- a/.devcontainer/GHC.Dockerfile
+++ b/.devcontainer/GHC.Dockerfile
@@ -57,11 +57,14 @@ RUN sysArch="$(uname -m)" \
## Update environment
ARG USE_ZSH_FOR_ROOT
-ARG SET_LANG
-ARG SET_TZ
+ARG LANG
+ARG TZ
-ENV TZ=${SET_TZ:-$TZ} \
- LANG=${SET_LANG:-$LANG}
+ARG LANG_OVERRIDE=${LANG}
+ARG TZ_OVERRIDE=${TZ}
+
+ENV LANG=${LANG_OVERRIDE:-$LANG} \
+ TZ=${TZ_OVERRIDE:-$TZ}
## Change root's shell to ZSH
RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index af8bbc1..a170044 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,8 +6,8 @@
"BUILD_ON_IMAGE": "glcr.b-data.ch/python/base",
"PYTHON_VERSION": "latest",
"USE_ZSH_FOR_ROOT": "unset-to-use-bash",
- "SET_LANG": "en_US.UTF-8",
- "SET_TZ": "Etc/UTC"
+ "LANG": "en_US.UTF-8",
+ "TZ": "Etc/UTC"
}
},
diff --git a/.devcontainer/ghc-9.10/devcontainer.json b/.devcontainer/ghc-9.10/devcontainer.json
index 6b41be7..93af95b 100644
--- a/.devcontainer/ghc-9.10/devcontainer.json
+++ b/.devcontainer/ghc-9.10/devcontainer.json
@@ -7,8 +7,8 @@
"GHC_VERSION": "9.10",
"HLS_VERSION": "2.10.0.0",
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
- "SET_LANG": "C.UTF-8",
- "SET_TZ": ""
+ "LANG": "C.UTF-8",
+ "TZ": ""
}
},
diff --git a/.devcontainer/ghc-9.12/devcontainer.json b/.devcontainer/ghc-9.12/devcontainer.json
index c12965a..d1a3303 100644
--- a/.devcontainer/ghc-9.12/devcontainer.json
+++ b/.devcontainer/ghc-9.12/devcontainer.json
@@ -7,8 +7,8 @@
"GHC_VERSION": "9.12",
"HLS_VERSION": "2.10.0.0",
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
- "SET_LANG": "C.UTF-8",
- "SET_TZ": ""
+ "LANG": "C.UTF-8",
+ "TZ": ""
}
},
diff --git a/.devcontainer/ghc-9.6/devcontainer.json b/.devcontainer/ghc-9.6/devcontainer.json
index 02fc18d..b247a3e 100644
--- a/.devcontainer/ghc-9.6/devcontainer.json
+++ b/.devcontainer/ghc-9.6/devcontainer.json
@@ -8,8 +8,8 @@
"HLS_VERSION": "2.10.0.0",
"STACK_VERSION": "3.1.1",
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
- "SET_LANG": "C.UTF-8",
- "SET_TZ": ""
+ "LANG": "C.UTF-8",
+ "TZ": ""
}
},
diff --git a/.devcontainer/ghc-9.8/devcontainer.json b/.devcontainer/ghc-9.8/devcontainer.json
index b4f5ed4..98ce90f 100644
--- a/.devcontainer/ghc-9.8/devcontainer.json
+++ b/.devcontainer/ghc-9.8/devcontainer.json
@@ -7,8 +7,8 @@
"GHC_VERSION": "9.8",
"HLS_VERSION": "2.10.0.0",
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
- "SET_LANG": "C.UTF-8",
- "SET_TZ": ""
+ "LANG": "C.UTF-8",
+ "TZ": ""
}
},
--
GitLab