Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/shib-idp
base: master
Choose a base ref
...
head repository: docker/shib-idp
compare: latest5
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 9 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 4, 2024

  1. update tomcat to 10.1.33

    @pcaskey
    pcaskey committed Dec 4, 2024
    Copy the full SHA
    f716c74 View commit details

  2. Merge pull request #144 from docker/5.1.3_20241204_rocky8_multiarch 

    update tomcat to 10.1.33
    @pcaskey
    pcaskey committed Dec 4, 2024
    Copy the full SHA
    049f51b View commit details

Commits on Jan 6, 2025

  1. update tomcat to 10.1.34

    @pcaskey
    pcaskey committed Jan 6, 2025
    Copy the full SHA
    9da1fb4 View commit details

  2. Merge pull request #145 from docker/5.1.3_20250106_rocky8_multiarch 

    update tomcat to 10.1.34
    @pcaskey
    pcaskey committed Jan 6, 2025
    Copy the full SHA
    0398895 View commit details

Commits on Feb 25, 2025

  1. re-base core OS to Rocky 9

    @pcaskey
    pcaskey committed Feb 25, 2025
    Copy the full SHA
    62ab639 View commit details

Commits on Mar 17, 2025

  1. bump tomcat to 10.1.39

    @pcaskey
    pcaskey committed Mar 17, 2025
    Copy the full SHA
    d44892d View commit details

  2. Merge pull request #146 from docker/5.1.3_20250317_rocky9_multiarch 

    merge 5.1.3 20250317 rocky9 multiarch
    @pcaskey
    pcaskey committed Mar 17, 2025
    Copy the full SHA
    854d58c View commit details

Commits on Mar 27, 2025

  1. update IdP to 5.1.4

    @pcaskey
    pcaskey committed Mar 27, 2025
    Copy the full SHA
    282b92f View commit details

  2. Merge pull request #147 from docker/5.1.4_20250327_rocky9_multiarch 

    update IdP to 5.1.4
    @pcaskey
    pcaskey committed Mar 27, 2025
    Copy the full SHA
    ab248f6 View commit details
Showing with 12 additions and 10 deletions.
  1. +1 −1 .trivyignore
  2. +8 −8 Dockerfile
  3. +1 −1 container_files/idp/idp.installer.properties
  4. +2 −0 container_files/system/startup.sh
2 changes: 1 addition & 1 deletion .trivyignore
View file
@@ -1,3 +1,3 @@
# Accept the risk
CVE-2016-1000027
# CVE-2016-1000027

16 changes: 8 additions & 8 deletions Dockerfile
View file
@@ -1,16 +1,16 @@
FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:8.10
FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.5

########################
### VERSION SETTINGS ###
########################
#
##tomcat \
ENV TOMCAT_MAJOR=10 \
TOMCAT_VERSION=10.1.30 \
TOMCAT_VERSION=10.1.39 \
##shib-idp \
VERSION=5.1.3 \
VERSION=5.1.4 \
##TIER \
TIERVERSION=20240930_rocky8_multiarch \
TIERVERSION=20250327_rocky9_multiarch \
#################### \
#### OTHER VARS #### \
#################### \
@@ -51,9 +51,9 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
&& echo "NETWORKING=yes" > /etc/sysconfig/network

# Install base deps
RUN rm -fr /var/cache/yum/* && yum clean all && yum -y update && yum -y install --setopt=tsflags=nodocs epel-release && \
yum -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man unzip vim rsyslog cronie krb5-workstation openssl-devel supervisor fontconfig findutils && \
yum -y clean all && \
RUN rm -fr /var/cache/dnf/* && dnf -y clean all && dnf -y update && dnf -y install --setopt=tsflags=nodocs epel-release && \
dnf -y --allowerasing install net-tools wget curl tar unzip mlocate logrotate strace telnet man unzip vim rsyslog cronie krb5-workstation openssl-devel supervisor fontconfig findutils && \
dnf -y clean all && \
mkdir -p /opt/tier && \
# Install Trusted Certificates
update-ca-trust force-enable
@@ -73,7 +73,7 @@ RUN update-ca-trust extract
# Install Corretto Java JDK (from Amazon repo, more arch independent)
RUN rpm --import https://yum.corretto.aws/corretto.key \
&& curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
&& yum install -y java-17-amazon-corretto-devel
&& dnf install -y java-17-amazon-corretto-devel
ENV JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto

# Copy IdP installer properties file(s)
2 changes: 1 addition & 1 deletion container_files/idp/idp.installer.properties
View file
@@ -1,4 +1,4 @@
idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-5.1.3
idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-5.1.4
idp.target.dir=/opt/shibboleth-idp
idp.host.name=idp.example.org
idp.sealer.password=changeit
2 changes: 2 additions & 0 deletions container_files/system/startup.sh
View file
@@ -58,6 +58,8 @@ rm -f ${IDP_LOG_CFG_FILE}.tmp
sed -i -e 's/rolling.RollingFileAppender/FileAppender/g' ${IDP_LOG_CFG_FILE}
sed -i -e '/<rollingPolicy/,/<\/rollingPolicy>/d' ${IDP_LOG_CFG_FILE}

# temp for 5.1.4
sed -i -e 's/<logger name=\"net.shibboleth.idp\" level=\"${idp.loglevel.idp}\"\/>/<logger name=\"net.shibboleth.idp\" level=\"${idp.loglevel.idp}\"\/>\n\n <!-- temporary for 5.1.4 -->\n <logger name=\"org.opensaml.saml.saml2.binding.decoding.impl.HTTPRedirectDeflateDecoder\" level=\"ERROR\" \/>/g' ${IDP_LOG_CFG_FILE}

#launch supervisord
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf