diff options
| author | Tobia Conforto <tobia.conforto@gmail.com> | 2022-07-12 23:24:01 +0200 |
|---|---|---|
| committer | pedropintosilva <65948705+pedropintosilva@users.noreply.github.com> | 2022-07-14 11:24:03 +0200 |
| commit | aba9091209f9b74b4d455ac03e225f4df9a658d3 (patch) | |
| tree | 671d6e6821d7d92c72b448219621f61d6d8d9a99 /docker | |
| parent | Calc: Add missing class to toolbar-wrapper when on tabbed view (diff) | |
| download | online-aba9091209f9b74b4d455ac03e225f4df9a658d3.tar.gz online-aba9091209f9b74b4d455ac03e225f4df9a658d3.zip | |
Added support for setting the timezone in Docker
Added the 'tzdata' package to Ubuntu-based Docker builds and the
'timezone' package to openSUSE builds, to allow Docker users to run
the containers with a custom timezone by passing a TZ env variable.
Signed-off-by: Tobia Conforto <tobia.conforto@gmail.com>
Change-Id: Idafd84dde3383b4801ff4b3ebb8ac1826fe49fcc
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README | 3 | ||||
| -rwxr-xr-x | docker/from-packages/scripts/install-collabora-online-ubuntu.sh | 3 | ||||
| -rw-r--r-- | docker/from-source/Ubuntu | 3 | ||||
| -rw-r--r-- | docker/from-source/openSUSE | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/docker/README b/docker/README index 719e816bc1..beb70299e6 100644 --- a/docker/README +++ b/docker/README @@ -5,6 +5,9 @@ working docker container with Collabora Online. Docker image can be built from packages or from source code. +All docker images built from this directory can be run with a TZ environment variable +to set the server timezone to something other than UTC. + Examples: 1. Build latest CODE based on Ubuntu 18.04 LTS diff --git a/docker/from-packages/scripts/install-collabora-online-ubuntu.sh b/docker/from-packages/scripts/install-collabora-online-ubuntu.sh index 0c2920ffe0..b663325532 100755 --- a/docker/from-packages/scripts/install-collabora-online-ubuntu.sh +++ b/docker/from-packages/scripts/install-collabora-online-ubuntu.sh @@ -9,6 +9,9 @@ apt-get update # Install HTTPS transport apt-get -y install apt-transport-https +# Install tzdata to accept the TZ environment variable +apt-get -y install tzdata + # Install some more fonts apt-get -y install fonts-open-sans diff --git a/docker/from-source/Ubuntu b/docker/from-source/Ubuntu index 7d31cec518..80ca6e157f 100644 --- a/docker/from-source/Ubuntu +++ b/docker/from-source/Ubuntu @@ -7,10 +7,11 @@ FROM ubuntu:18.04 # refresh repos otherwise installations later may fail # install LibreOffice run-time dependencies # install adduser, findutils, openssl and cpio that we need later +# install tzdata to accept the TZ environment variable # install an editor # tdf#117557 - Add CJK Fonts to Collabora Online Docker Image RUN apt-get update && \ - apt-get -y install libpng16-16 fontconfig adduser cpio \ + apt-get -y install libpng16-16 fontconfig adduser cpio tzdata \ findutils nano \ libcap2-bin openssl openssh-client inotify-tools procps \ libxcb-shm0 libxcb-render0 libxrender1 libxext6 \ diff --git a/docker/from-source/openSUSE b/docker/from-source/openSUSE index 097b8e10c1..e8275e6cba 100644 --- a/docker/from-source/openSUSE +++ b/docker/from-source/openSUSE @@ -6,10 +6,11 @@ FROM opensuse/leap # refresh repos otherwise installations later may fail # install LibreOffice run-time dependencies +# install timezone data to accept the TZ environment variable # install an editor # tdf#117557 - Add CJK Fonts to Collabora Online Docker Image RUN zypper ref && \ - zypper --non-interactive install libcap-progs libpng16-16 fontconfig nano openssh inotify-tools + zypper --non-interactive install libcap-progs libpng16-16 fontconfig nano openssh inotify-tools timezone # copy freshly built LOKit and Collabora Online COPY /instdir / |