Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove timezone setting from containers
mederly committed Sep 27, 2018
1 parent c2a3569 commit b53ba3f
Showing 5 changed files with 0 additions and 28 deletions.
5 changes: 0 additions & 5 deletions 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 <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"]
5 changes: 0 additions & 5 deletions 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
5 changes: 0 additions & 5 deletions demo/complex/grouper-ui/Dockerfile
@@ -4,9 +4,4 @@ LABEL author="tier-packaging@internet2.edu <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"]
5 changes: 0 additions & 5 deletions demo/complex/idp/Dockerfile
@@ -2,9 +2,4 @@ FROM unicon/shibboleth-idp:latest

LABEL author="tier-packaging@internet2.edu <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/
8 changes: 0 additions & 8 deletions 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"]

0 comments on commit b53ba3f

Please sign in to comment.