Skip to content

Commit 5ff83ee

Browse files
committed
Rename variables for setting LANG and TZ
1 parent e7ef31e commit 5ff83ee

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.devcontainer/GHC.Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,14 @@ RUN sysArch="$(uname -m)" \
5656

5757
## Update environment
5858
ARG USE_ZSH_FOR_ROOT
59-
ARG SET_LANG
60-
ARG SET_TZ
59+
ARG LANG
60+
ARG TZ
6161

62-
ENV TZ=${SET_TZ:-$TZ} \
63-
LANG=${SET_LANG:-$LANG}
62+
ARG LANG_OVERRIDE=${LANG}
63+
ARG TZ_OVERRIDE=${TZ}
64+
65+
ENV LANG=${LANG_OVERRIDE:-$LANG} \
66+
TZ=${TZ_OVERRIDE:-$TZ}
6467

6568
## Change root's shell to ZSH
6669
RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"GHC_VERSION": "9.8.4",
77
"HLS_VERSION": "2.10.0.0",
88
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
9-
"SET_LANG": "C.UTF-8",
10-
"SET_TZ": ""
9+
"LANG": "C.UTF-8",
10+
"TZ": ""
1111
}
1212
},
1313

.devcontainer/ghc-9.10.1/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"args": {
77
"GHC_VERSION": "9.10.1",
88
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
9-
"SET_LANG": "C.UTF-8",
10-
"SET_TZ": ""
9+
"LANG": "C.UTF-8",
10+
"TZ": ""
1111
}
1212
},
1313

.devcontainer/ghc-9.12.1/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"args": {
77
"GHC_VERSION": "9.12.1",
88
"USE_ZSH_FOR_ROOT": "unset-to-use-ash",
9-
"SET_LANG": "C.UTF-8",
10-
"SET_TZ": ""
9+
"LANG": "C.UTF-8",
10+
"TZ": ""
1111
}
1212
},
1313

0 commit comments

Comments
 (0)