diff --git a/Dockerfile b/Dockerfile index 420f715..7a25d68 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ FROM alpine:3.7 as bootstrap -ARG version=1.6.0-RC1 +ARG version=1.7.0-RC2 -COPY bootstrapfiles/shibui-${version}.jar.sha256sum . +COPY bootstrapfiles/shibui-${version}.war.sha256sum . -RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.jar \ - && sha256sum -c shibui-${version}.jar.sha256sum && mv shibui-${version}.jar shibui.jar +RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \ + && sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war FROM centos:7 # beacon env ENV VERSION=${version} \ - TIERVERSION=191010 \ + TIERVERSION=20200210 \ IMAGE=shibboleth_idp_ui \ MAINTAINER=InCommon @@ -26,16 +26,10 @@ RUN yum -q -qy update \ && rm -rf /var/cache/yum RUN mkdir -p /opt/shibui -COPY --from=bootstrap shibui.jar /opt/shibui/ +COPY --from=bootstrap shibui.war /opt/shibui/ COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf COPY containerfiles/users.txt /opt/shibui -COPY containerfiles/sendtierbeacon.sh /usr/bin -COPY containerfiles/setupcron.sh /usr/bin -RUN chmod +x /usr/bin/sendtierbeacon.sh \ - && mkdir /opt/tier \ - && chmod +x /usr/bin/setupcron.sh \ - && /usr/bin/setupcron.sh # TIER Beacon Opt-out # Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2. diff --git a/bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum b/bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum new file mode 100644 index 0000000..ae3626e --- /dev/null +++ b/bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum @@ -0,0 +1 @@ +efb9a961c209db19d403fb81e00037c5339d1af0f141bdaa2c27489708d5cf16 shibui-1.7.0-RC1.jar diff --git a/bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum b/bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum new file mode 100644 index 0000000..2764d35 --- /dev/null +++ b/bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum @@ -0,0 +1 @@ +894e4163b4d1581a4587032bf6ea2df21244421445da368babae909f45c4df4b shibui-1.7.0-RC2.war diff --git a/common.bash b/common.bash index 6bb1eb0..57f9d12 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="tier" imagename="shib-idp-ui" -version=1.4.1 \ No newline at end of file +version=1.7.0-RC2 diff --git a/containerfiles/supervisord.conf b/containerfiles/supervisord.conf index 3a484e5..3798de3 100755 --- a/containerfiles/supervisord.conf +++ b/containerfiles/supervisord.conf @@ -5,16 +5,6 @@ loglevel=error nodaemon=true user=root -[program:cron] -command=/usr/sbin/crond -n -autostart=true -autorestart=true -stdout_logfile=/proc/1/fd/1 -stdout_logfile_maxbytes=0 -stderr_logfile=/proc/1/fd/1 -stderr_logfile_maxbytes=0 -directory=/usr/bin - [program:shibui] command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.jar --shibui.user-bootstrap-resource=file:users.txt directory=/opt/shibui diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index f7a06a6..eac4d58 100755 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -16,7 +16,7 @@ services: volumes: - mariadb-data:/var/lib/mysql shibui: - image: tier/shib-idp-ui:1.6.0-RC1 + image: tier/shib-idp-ui:1.7.0-RC2 depends_on: - db ports: diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile index 0e872db..f5d138c 100755 --- a/test-compose/idp/Dockerfile +++ b/test-compose/idp/Dockerfile @@ -1,7 +1,7 @@ -FROM tier/shib-idp:3.4.0_181002 +FROM tier/shib-idp:latest COPY container-files/conf/* /opt/shibboleth-idp/conf/ COPY container-files/credentials/* /opt/shibboleth-idp/credentials/ COPY container-files/metadata/* /opt/shibboleth-idp/metadata COPY container-files/tomcat-conf/server.xml /usr/local/tomcat/conf/test.xml -COPY container-files/tomcat-conf/idp-browser.p12 /opt/certs \ No newline at end of file +COPY container-files/tomcat-conf/idp-browser.p12 /opt/certs