extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2025-08-18 18:38:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-4519-set-default-value-for-tz-in-our-core-images-etc-utc' into 'develop'

Browse Source 
KASM-4519 Setting TZ environment variable

Closes KASM-4519

See merge request kasm-technologies/internal/workspaces-core-images!131
This commit is contained in:
Justin Travis
2023-07-19 17:24:16 +00:00
parent cd0324daf5 f71e2e908e
commit 3e61ee82c4
6 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dockerfile-kasm-core
View File

@@ -9,6 +9,7 @@ ARG DISTRO=ubuntu
ARG LANG='en_US.UTF-8' ARG LANG='en_US.UTF-8'
ARG LANGUAGE='en_US:en' ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG TZ='Etc/UTC'
ENV DEBIAN_FRONTEND=noninteractive \ ENV DEBIAN_FRONTEND=noninteractive \
DISTRO=$DISTRO \ DISTRO=$DISTRO \
HOME=/home/kasm-default-profile \ HOME=/home/kasm-default-profile \
@@ -17,6 +18,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
LANG=$LANG \ LANG=$LANG \
LANGUAGE=$LANGUAGE \ LANGUAGE=$LANGUAGE \
LC_ALL=$LC_ALL \ LC_ALL=$LC_ALL \
TZ=$TZ \
STARTUPDIR=/dockerstartup STARTUPDIR=/dockerstartup
### Home setup ### Home setup
@@ -179,6 +181,7 @@ ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG START_PULSEAUDIO=1 ARG START_PULSEAUDIO=1
ARG START_XFCE4=1 ARG START_XFCE4=1
ARG TZ='Etc/UTC'
ENV AUDIO_PORT=4901 \ ENV AUDIO_PORT=4901 \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
DISPLAY=:1 \ DISPLAY=:1 \
@@ -211,7 +214,8 @@ ENV AUDIO_PORT=4901 \
VNC_PW=vncpassword \ VNC_PW=vncpassword \
VNC_RESOLUTION=1280x1024 \ VNC_RESOLUTION=1280x1024 \
VNC_RESOLUTION=1280x720 \ VNC_RESOLUTION=1280x720 \
VNC_VIEW_ONLY_PW=vncviewonlypassword VNC_VIEW_ONLY_PW=vncviewonlypassword \
TZ=$TZ
### Ports and user ### Ports and user
EXPOSE $VNC_PORT \ EXPOSE $VNC_PORT \

6
dockerfile-kasm-core-alpine
View File

@@ -25,6 +25,7 @@ ARG DISTRO=alpine
ARG LANG='en_US.UTF-8' ARG LANG='en_US.UTF-8'
ARG LANGUAGE='en_US:en' ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG TZ='Etc/UTC'
ENV DISTRO=$DISTRO \ ENV DISTRO=$DISTRO \
HOME=/home/kasm-default-profile \ HOME=/home/kasm-default-profile \
INST_SCRIPTS=/dockerstartup/install \ INST_SCRIPTS=/dockerstartup/install \
@@ -32,6 +33,7 @@ ENV DISTRO=$DISTRO \
LANG=$LANG \ LANG=$LANG \
LANGUAGE=$LANGUAGE \ LANGUAGE=$LANGUAGE \
LC_ALL=$LC_ALL \ LC_ALL=$LC_ALL \
TZ=$TZ \
STARTUPDIR=/dockerstartup STARTUPDIR=/dockerstartup
### Home setup ### Home setup
@@ -171,6 +173,7 @@ ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG START_PULSEAUDIO=1 ARG START_PULSEAUDIO=1
ARG START_XFCE4=1 ARG START_XFCE4=1
ARG TZ='Etc/UTC'
ENV AUDIO_PORT=4901 \ ENV AUDIO_PORT=4901 \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
DISPLAY=:1 \ DISPLAY=:1 \
@@ -203,7 +206,8 @@ ENV AUDIO_PORT=4901 \
VNC_PW=vncpassword \ VNC_PW=vncpassword \
VNC_RESOLUTION=1280x1024 \ VNC_RESOLUTION=1280x1024 \
VNC_RESOLUTION=1280x720 \ VNC_RESOLUTION=1280x720 \
VNC_VIEW_ONLY_PW=vncviewonlypassword VNC_VIEW_ONLY_PW=vncviewonlypassword \
TZ=$TZ
### Ports and user ### Ports and user
EXPOSE $VNC_PORT \ EXPOSE $VNC_PORT \

6
dockerfile-kasm-core-centos
View File

@@ -27,6 +27,7 @@ ARG DISTRO=centos
ARG LANG='en_US.UTF-8' ARG LANG='en_US.UTF-8'
ARG LANGUAGE='en_US:en' ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG TZ='Etc/UTC'
ENV HOME=/home/kasm-default-profile \ ENV HOME=/home/kasm-default-profile \
TERM=xterm \ TERM=xterm \
STARTUPDIR=/dockerstartup \ STARTUPDIR=/dockerstartup \
@@ -37,6 +38,7 @@ ENV HOME=/home/kasm-default-profile \
LANG=$LANG \ LANG=$LANG \
LANGUAGE=$LANGUAGE \ LANGUAGE=$LANGUAGE \
LC_ALL=$LC_ALL \ LC_ALL=$LC_ALL \
TZ=$TZ \
DISTRO=$DISTRO DISTRO=$DISTRO
WORKDIR $HOME WORKDIR $HOME
@@ -174,6 +176,7 @@ ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG START_PULSEAUDIO=1 ARG START_PULSEAUDIO=1
ARG START_XFCE4=1 ARG START_XFCE4=1
ARG TZ='Etc/UTC'
ENV AUDIO_PORT=4901 \ ENV AUDIO_PORT=4901 \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
DISPLAY=:1 \ DISPLAY=:1 \
@@ -205,7 +208,8 @@ ENV AUDIO_PORT=4901 \
VNC_PW=vncpassword \ VNC_PW=vncpassword \
VNC_RESOLUTION=1280x1024 \ VNC_RESOLUTION=1280x1024 \
VNC_RESOLUTION=1280x720 \ VNC_RESOLUTION=1280x720 \
VNC_VIEW_ONLY_PW=vncviewonlypassword VNC_VIEW_ONLY_PW=vncviewonlypassword \
TZ=$TZ
### Ports and user ### Ports and user
EXPOSE $VNC_PORT \ EXPOSE $VNC_PORT \

6
dockerfile-kasm-core-fedora
View File

@@ -32,6 +32,7 @@ ARG DISTRO=fedora37
ARG LANG='en_US.UTF-8' ARG LANG='en_US.UTF-8'
ARG LANGUAGE='en_US:en' ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG TZ='Etc/UTC'
ENV HOME=/home/kasm-default-profile \ ENV HOME=/home/kasm-default-profile \
TERM=xterm \ TERM=xterm \
STARTUPDIR=/dockerstartup \ STARTUPDIR=/dockerstartup \
@@ -41,6 +42,7 @@ ENV HOME=/home/kasm-default-profile \
LANG=$LANG \ LANG=$LANG \
LANGUAGE=$LANGUAGE \ LANGUAGE=$LANGUAGE \
LC_ALL=$LC_ALL \ LC_ALL=$LC_ALL \
TZ=$TZ \
DISTRO=$DISTRO DISTRO=$DISTRO
WORKDIR $HOME WORKDIR $HOME
@@ -182,6 +184,7 @@ ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG START_PULSEAUDIO=1 ARG START_PULSEAUDIO=1
ARG START_XFCE4=1 ARG START_XFCE4=1
ARG TZ='Etc/UTC'
ENV AUDIO_PORT=4901 \ ENV AUDIO_PORT=4901 \
DISPLAY=:1 \ DISPLAY=:1 \
DISTRO=$DISTRO \ DISTRO=$DISTRO \
@@ -212,7 +215,8 @@ ENV AUDIO_PORT=4901 \
VNC_PW=vncpassword \ VNC_PW=vncpassword \
VNC_RESOLUTION=1280x1024 \ VNC_RESOLUTION=1280x1024 \
VNC_RESOLUTION=1280x720 \ VNC_RESOLUTION=1280x720 \
VNC_VIEW_ONLY_PW=vncviewonlypassword VNC_VIEW_ONLY_PW=vncviewonlypassword \
TZ=$TZ
### Ports and user ### Ports and user
EXPOSE $VNC_PORT \ EXPOSE $VNC_PORT \

6
dockerfile-kasm-core-oracle
View File

@@ -37,6 +37,7 @@ ARG DISTRO=oracle8
ARG LANG='en_US.UTF-8' ARG LANG='en_US.UTF-8'
ARG LANGUAGE='en_US:en' ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG TZ='Etc/UTC'
ENV HOME=/home/kasm-default-profile \ ENV HOME=/home/kasm-default-profile \
TERM=xterm \ TERM=xterm \
STARTUPDIR=/dockerstartup \ STARTUPDIR=/dockerstartup \
@@ -47,6 +48,7 @@ ENV HOME=/home/kasm-default-profile \
LANG=$LANG \ LANG=$LANG \
LANGUAGE=$LANGUAGE \ LANGUAGE=$LANGUAGE \
LC_ALL=$LC_ALL \ LC_ALL=$LC_ALL \
TZ=$TZ \
DISTRO=$DISTRO DISTRO=$DISTRO
WORKDIR $HOME WORKDIR $HOME
@@ -201,6 +203,7 @@ ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG START_PULSEAUDIO=1 ARG START_PULSEAUDIO=1
ARG START_XFCE4=1 ARG START_XFCE4=1
ARG TZ='Etc/UTC'
ENV AUDIO_PORT=4901 \ ENV AUDIO_PORT=4901 \
DISPLAY=:1 \ DISPLAY=:1 \
DISTRO=$DISTRO \ DISTRO=$DISTRO \
@@ -231,7 +234,8 @@ ENV AUDIO_PORT=4901 \
VNC_PW=vncpassword \ VNC_PW=vncpassword \
VNC_RESOLUTION=1280x1024 \ VNC_RESOLUTION=1280x1024 \
VNC_RESOLUTION=1280x720 \ VNC_RESOLUTION=1280x720 \
VNC_VIEW_ONLY_PW=vncviewonlypassword VNC_VIEW_ONLY_PW=vncviewonlypassword \
TZ=$TZ
### Ports and user ### Ports and user
EXPOSE $VNC_PORT \ EXPOSE $VNC_PORT \

6
dockerfile-kasm-core-suse
View File

@@ -28,6 +28,7 @@ ARG DISTRO=opensuse
ARG LANG='en_US.UTF-8' ARG LANG='en_US.UTF-8'
ARG LANGUAGE='en_US:en' ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG TZ='Etc/UTC'
ENV HOME=/home/kasm-default-profile \ ENV HOME=/home/kasm-default-profile \
TERM=xterm \ TERM=xterm \
STARTUPDIR=/dockerstartup \ STARTUPDIR=/dockerstartup \
@@ -37,6 +38,7 @@ ENV HOME=/home/kasm-default-profile \
LANG=$LANG \ LANG=$LANG \
LANGUAGE=$LANGUAGE \ LANGUAGE=$LANGUAGE \
LC_ALL=$LC_ALL \ LC_ALL=$LC_ALL \
TZ=$TZ \
PULSE_RUNTIME_PATH=/var/run/pulse \ PULSE_RUNTIME_PATH=/var/run/pulse \
DISTRO=$DISTRO DISTRO=$DISTRO
@@ -180,6 +182,7 @@ ARG LANGUAGE='en_US:en'
ARG LC_ALL='en_US.UTF-8' ARG LC_ALL='en_US.UTF-8'
ARG START_PULSEAUDIO=1 ARG START_PULSEAUDIO=1
ARG START_XFCE4=1 ARG START_XFCE4=1
ARG TZ='Etc/UTC'
ENV AUDIO_PORT=4901 \ ENV AUDIO_PORT=4901 \
DISPLAY=:1 \ DISPLAY=:1 \
DISTRO=$DISTRO \ DISTRO=$DISTRO \
@@ -210,7 +213,8 @@ ENV AUDIO_PORT=4901 \
VNC_PW=vncpassword \ VNC_PW=vncpassword \
VNC_RESOLUTION=1280x1024 \ VNC_RESOLUTION=1280x1024 \
VNC_RESOLUTION=1280x720 \ VNC_RESOLUTION=1280x720 \
VNC_VIEW_ONLY_PW=vncviewonlypassword VNC_VIEW_ONLY_PW=vncviewonlypassword \
TZ=$TZ
USER 1000 USER 1000