From b49e15708653a22004eca42999f5f39258854caf Mon Sep 17 00:00:00 2001 From: Jim Schaff Date: Mon, 28 Aug 2023 14:46:16 -0400 Subject: [PATCH] set container timezone to New_York (really want portable host timezone) --- docker/build/Dockerfile-admin-dev | 6 +++++- docker/build/Dockerfile-api-dev | 7 ++++++- docker/build/Dockerfile-batch-dev | 4 ++++ docker/build/Dockerfile-data-dev | 4 ++++ docker/build/Dockerfile-db-dev | 4 ++++ docker/build/Dockerfile-sched-dev | 4 ++++ docker/build/Dockerfile-submit-dev | 4 ++++ docker/build/Dockerfile-web-dev | 4 ++++ 8 files changed, 35 insertions(+), 2 deletions(-) diff --git a/docker/build/Dockerfile-admin-dev b/docker/build/Dockerfile-admin-dev index c7099e60d2..c9c0430d24 100644 --- a/docker/build/Dockerfile-admin-dev +++ b/docker/build/Dockerfile-admin-dev @@ -3,7 +3,11 @@ FROM ubuntu:18.04 RUN apt-get -y update && \ apt-get install -y curl openjdk-8-jre dnsutils && \ mkdir -p /usr/local/app/lib - + +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-server/target/vcell-server-0.0.1-SNAPSHOT.jar \ diff --git a/docker/build/Dockerfile-api-dev b/docker/build/Dockerfile-api-dev index 8712553252..0e4d06cd6a 100644 --- a/docker/build/Dockerfile-api-dev +++ b/docker/build/Dockerfile-api-dev @@ -3,7 +3,11 @@ FROM ubuntu:18.04 RUN apt-get -y update && \ apt-get install -y curl openjdk-8-jre dnsutils && \ mkdir -p /usr/local/app/lib - + +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-server/target/vcell-server-0.0.1-SNAPSHOT.jar \ @@ -60,6 +64,7 @@ ENTRYPOINT java \ -Dvcell.server.dbDriverName="${dbdriver}" \ -Dvcell.server.dbUserid="${dbuser}" \ -Dvcell.db.pswdfile="${dbpswdfile}" \ + -Duser.timezone="${userTimezone}" \ -Dvcell.jms.int.host.internal="${jmshost_int_internal}" \ -Dvcell.jms.int.port.internal="${jmsport_int_internal}" \ -Dvcell.jms.blobMessageUseMongo=true \ diff --git a/docker/build/Dockerfile-batch-dev b/docker/build/Dockerfile-batch-dev index f6871e5832..9e3ba3fc76 100644 --- a/docker/build/Dockerfile-batch-dev +++ b/docker/build/Dockerfile-batch-dev @@ -86,6 +86,10 @@ RUN apt-get -y update && \ # wget --no-check-certificate https://download.opensuse.org/repositories/home:/fbergman:/COPASI/xUbuntu_17.10/amd64/python-copasi_4.22.170-1_amd64.deb && \ # gdebi -n -q python-copasi_4.22.170-1_amd64.deb +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + RUN mkdir -p /usr/local/app/localsolvers && ln -s /vcellbin /usr/local/app/localsolvers/linux64 WORKDIR /usr/local/app diff --git a/docker/build/Dockerfile-data-dev b/docker/build/Dockerfile-data-dev index 8901c8fa58..85be234adc 100644 --- a/docker/build/Dockerfile-data-dev +++ b/docker/build/Dockerfile-data-dev @@ -60,6 +60,10 @@ RUN mkdir -p /usr/local/app && \ apk add openssh-client && \ apk add screen +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-server/target/vcell-server-0.0.1-SNAPSHOT.jar \ diff --git a/docker/build/Dockerfile-db-dev b/docker/build/Dockerfile-db-dev index 96430dc463..f2eb12f4da 100644 --- a/docker/build/Dockerfile-db-dev +++ b/docker/build/Dockerfile-db-dev @@ -4,6 +4,10 @@ RUN mkdir -p /usr/local/app && \ apk update && \ apk add screen +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-server/target/vcell-server-0.0.1-SNAPSHOT.jar \ diff --git a/docker/build/Dockerfile-sched-dev b/docker/build/Dockerfile-sched-dev index 9b729c2518..9eb39a7a54 100644 --- a/docker/build/Dockerfile-sched-dev +++ b/docker/build/Dockerfile-sched-dev @@ -6,6 +6,10 @@ RUN mkdir -p /usr/local/app && \ apk add curl && \ apk add screen +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-server/target/vcell-server-0.0.1-SNAPSHOT.jar \ diff --git a/docker/build/Dockerfile-submit-dev b/docker/build/Dockerfile-submit-dev index 44b1e5953d..9851c00f14 100644 --- a/docker/build/Dockerfile-submit-dev +++ b/docker/build/Dockerfile-submit-dev @@ -5,6 +5,10 @@ RUN mkdir -p /usr/local/app && \ apk add openssh-client && \ apk add screen +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-server/target/vcell-server-0.0.1-SNAPSHOT.jar \ diff --git a/docker/build/Dockerfile-web-dev b/docker/build/Dockerfile-web-dev index 264132d078..f9da0dac6a 100644 --- a/docker/build/Dockerfile-web-dev +++ b/docker/build/Dockerfile-web-dev @@ -4,6 +4,10 @@ RUN apt-get -y update && \ apt-get install -y curl openjdk-8-jre wget dnsutils && \ mkdir -p /usr/local/app/lib +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata +RUN unlink /etc/localtime || true +RUN ln -s /usr/share/zoneinfo/America/New_York /etc/localtime + WORKDIR /usr/local/app COPY ./vcell-web/target/vcell-web-0.0.1-SNAPSHOT.jar \