From b53ba3fa746d21cc077b8800cd6d2ef3ba37c901 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Thu, 27 Sep 2018 12:59:45 +0200 Subject: [PATCH] Remove timezone setting from containers --- demo/complex/grouper-daemon/Dockerfile | 5 ----- demo/complex/grouper-data/Dockerfile | 5 ----- demo/complex/grouper-ui/Dockerfile | 5 ----- demo/complex/idp/Dockerfile | 5 ----- midpoint/midpoint-server/Dockerfile | 8 -------- 5 files changed, 28 deletions(-) diff --git a/demo/complex/grouper-daemon/Dockerfile b/demo/complex/grouper-daemon/Dockerfile index 289c1a2..55151f3 100644 --- a/demo/complex/grouper-daemon/Dockerfile +++ b/demo/complex/grouper-daemon/Dockerfile @@ -2,9 +2,4 @@ FROM tier/grouper:2.3.0-a109-u47-w12-p21 LABEL author="tier-packaging@internet2.edu " -# JUST FOR TESTING - REMOVE BEFORE RELEASE -RUN rm /etc/localtime \ - && ln -s /usr/share/zoneinfo/US/Central /etc/localtime \ - && date - CMD ["daemon"] diff --git a/demo/complex/grouper-data/Dockerfile b/demo/complex/grouper-data/Dockerfile index a87330c..dda3442 100644 --- a/demo/complex/grouper-data/Dockerfile +++ b/demo/complex/grouper-data/Dockerfile @@ -37,9 +37,4 @@ RUN (mysqld_safe & ) \ EXPOSE 3306 -# JUST FOR TESTING - REMOVE BEFORE RELEASE -RUN rm /etc/localtime \ - && ln -s /usr/share/zoneinfo/US/Central /etc/localtime \ - && date - CMD mysqld_safe diff --git a/demo/complex/grouper-ui/Dockerfile b/demo/complex/grouper-ui/Dockerfile index a1cce4f..bfec7b9 100644 --- a/demo/complex/grouper-ui/Dockerfile +++ b/demo/complex/grouper-ui/Dockerfile @@ -4,9 +4,4 @@ LABEL author="tier-packaging@internet2.edu " #COPY in custom css, images, etc -# JUST FOR TESTING - REMOVE BEFORE RELEASE -RUN rm /etc/localtime \ - && ln -s /usr/share/zoneinfo/US/Central /etc/localtime \ - && date - CMD ["ui"] diff --git a/demo/complex/idp/Dockerfile b/demo/complex/idp/Dockerfile index 35eb456..7d0b512 100644 --- a/demo/complex/idp/Dockerfile +++ b/demo/complex/idp/Dockerfile @@ -2,9 +2,4 @@ FROM unicon/shibboleth-idp:latest LABEL author="tier-packaging@internet2.edu " -# JUST FOR TESTING - REMOVE BEFORE RELEASE -RUN rm /etc/localtime \ - && ln -s /usr/share/zoneinfo/US/Central /etc/localtime \ - && date - COPY shibboleth-idp/ /opt/shibboleth-idp/ diff --git a/midpoint/midpoint-server/Dockerfile b/midpoint/midpoint-server/Dockerfile index d28d068..be36460 100644 --- a/midpoint/midpoint-server/Dockerfile +++ b/midpoint/midpoint-server/Dockerfile @@ -6,9 +6,6 @@ FROM tier/shibboleth_sp MAINTAINER info@evolveum.com -ENV TZ=UTC -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems RUN curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo RUN yum -y update @@ -101,11 +98,6 @@ ENV TIER_MAINTAINER=tier # requires MP_VERSION and TIER_xyz variables so we have to execute it here -# JUST FOR TESTING - REMOVE BEFORE RELEASE -RUN rm /etc/localtime \ - && ln -s /usr/share/zoneinfo/US/Central /etc/localtime \ - && date - RUN /opt/tier/setenv.sh CMD ["/usr/local/bin/startup.sh"]