From c442d4c9977cb52c29e59224738dac8694a9e388 Mon Sep 17 00:00:00 2001 From: Brett <54408245+kowh-ai@users.noreply.github.com> Date: Tue, 11 May 2021 14:25:39 +0200 Subject: [PATCH] build.yml --- .github/workflows/build.yml | 2 -- ckan/Dockerfile | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b79d97b..71084e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,5 @@ jobs: # run: | # docker build ./datapusher -t kowhai/ckan-docker-datapusher:testing-only - name: Docker CKAN build - env: - TZ: UTC run: | docker build ./ckan -t kowhai/ckan-docker-ckan:testing-only \ No newline at end of file diff --git a/ckan/Dockerfile b/ckan/Dockerfile index cc91c32..b0fbad9 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -5,7 +5,8 @@ LABEL maintainer="brett@kowh.ai" # Set timezone ENV TZ=UTC RUN echo $TZ > /etc/timezone -RUN cat /etc/timezone + +# Make sure both files are not exactly the same RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \ cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\ fi ;