Skip to content

Commit

Permalink
Merge pull request #78 from docker/3.4.6_20200303
Browse files Browse the repository at this point in the history
merge 3.4.6_20200303
  • Loading branch information
pcaskey authored Mar 3, 2020
2 parents ca3e808 + 9db8066 commit 31cede6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ FROM centos:centos7
#
##tomcat \
ENV TOMCAT_MAJOR=9 \
TOMCAT_VERSION=9.0.30 \
TOMCAT_VERSION=9.0.31 \
##shib-idp \
VERSION=3.4.6 \
##TIER \
TIERVERSION=20200107 \
TIERVERSION=20200303 \
################## \
### OTHER VARS ### \
################## \
Expand Down
2 changes: 1 addition & 1 deletion test-compose/idp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tier/shib-idp:3.4.6_20200107
FROM tier/shib-idp:3.4.6_20200303

# The build args below can be used at build-time to tell the build process where to find your config files. This is for a completely burned-in config.
ARG TOMCFG=config/tomcat
Expand Down

0 comments on commit 31cede6

Please sign in to comment.