Skip to content

merge 5.1.3 20250317 rocky9 multiarch #146

merged 2 commits into from Mar 17, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
re-base core OS to Rocky 9
pcaskey committed Feb 25, 2025
commit 62ab639de8290c9851e8f3d89a65130910d060a7
2 changes: 1 addition & 1 deletion .trivyignore
@@ -1,3 +1,3 @@
# Accept the risk
CVE-2016-1000027
# CVE-2016-1000027

14 changes: 7 additions & 7 deletions Dockerfile
@@ -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.34 \
TOMCAT_VERSION=10.1.36 \
##shib-idp \
VERSION=5.1.3 \
##TIER \
TIERVERSION=20250106_rocky8_multiarch \
TIERVERSION=20250225_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)