Skip to content
Jump to bottom

bump tomcat #76

Merged
merged 2 commits into from
Jan 7, 2020
Merged

bump tomcat #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66ff31a
bump tomcat, switch corretto to use new perm URL
pcaskey Jan 7, 2020
54faaf6
fix test Dockerfile
pcaskey Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Dockerfile
View file
Open in desktop
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.29 \
TOMCAT_VERSION=9.0.30 \
##shib-idp \
VERSION=3.4.6 \
##TIER \
TIERVERSION=20191202 \
TIERVERSION=20200107 \
################## \
### OTHER VARS ### \
################## \
Expand Down Expand Up @@ -71,11 +71,10 @@ RUN update-ca-trust extract

# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
# https://d3pxv6yz143wms.cloudfront.net/8.232.09.1/java-1.8.0-amazon-corretto-devel-1.8.0_232.b09-1.x86_64.rpm
ARG CORRETTO_RPM=java-1.8.0-amazon-corretto-devel-1.8.0_232.b09-1.x86_64.rpm
ARG CORRETTO_URL_BASE=https://d3pxv6yz143wms.cloudfront.net/8.232.09.1
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
COPY container_files/java-corretto/corretto-signing-key.pub .
RUN curl -O $CORRETTO_URL_BASE/$CORRETTO_RPM \
RUN curl -O -L $CORRETTO_URL_PERM \
&& rpm --import corretto-signing-key.pub \
&& rpm -K $CORRETTO_RPM \
&& rpm -i $CORRETTO_RPM \
Expand Down
1 change: 0 additions & 1 deletion container_files/java-corretto/corretto-signing-key.pub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ AD46rInpczupnoVoJcsh2ZJSxNKjLWrhcLGwK2R71Dx8tes5a2fXWFYcZNd8vxzf
liPnOeKP
=8WmP
-----END PGP PUBLIC KEY BLOCK-----

2 changes: 1 addition & 1 deletion test-compose/idp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tier/shib-idp:3.4.6_20191202
FROM tier/shib-idp:3.4.6_20200107

# 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