Skip to content

Commit

Permalink
Merge pull request #6646 from benz0li/update-dev-containers-4fb994f
Browse files Browse the repository at this point in the history
Dev Containers: Update handling of timezone setting
  • Loading branch information
mpilgrem authored Aug 17, 2024
2 parents 4fb994f + 648b5b3 commit 06b8dd3
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions .devcontainer/GHC.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,13 @@ RUN if [ -n "$USE_ZSH_FOR_ROOT" ]; then \
fix-chsh.sh; \
chsh -s /bin/zsh; \
fi \
## Update timezone if needed
## Update timezone if requested
&& 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 \
## Add/Update locale if needed
## Info about timezone
&& echo "TZ is set to $TZ" \
## Add/Update locale if requested
&& if [ "$LANG" != "C.UTF-8" ]; then \
if [ -n "$LANG" ]; then \
apk add --no-cache musl-locales musl-locales-lang; \
Expand All @@ -84,7 +83,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
Expand Down

0 comments on commit 06b8dd3

Please sign in to comment.