Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
5.12.0
mchyzer committed Aug 27, 2024
1 parent f9c031d commit c2441c9
Showing 4 changed files with 15 additions and 74 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM --platform=$TARGETPLATFORM rockylinux:8.8
FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.4

LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
Vendor="TIER" \
@@ -8,17 +8,17 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \

ARG GROUPER_CONTAINER_VERSION

ENV GROUPER_VERSION=5.11.3 \
GROUPER_CONTAINER_VERSION=5.11.3 \
ENV GROUPER_VERSION=5.12.0 \
GROUPER_CONTAINER_VERSION=5.12.0 \
JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF

# net-tools curl mlocate strace telnet man vim rsyslog cron mod_ssl cronie
RUN yum update -y \
&& yum install -y logrotate python3-pip rsync sudo patch wget tar unzip dos2unix file net-tools diffutils curl mlocate logrotate strace telnet man vim rsyslog cronie findutils procps \
RUN dnf update -y \
&& dnf install -y logrotate python3-pip rsync sudo patch wget tar unzip dos2unix file net-tools diffutils curl mlocate logrotate strace telnet man vim rsyslog cronie findutils procps \
&& pip3 install --upgrade setuptools \
&& yum clean -y all \
&& dnf clean -y all \
&& groupadd -g 994 -r tomcat \
&& useradd -u 996 -r -m -s /sbin/nologin -g tomcat tomcat \
&& mkdir -p /opt/container_files
@@ -29,7 +29,7 @@ RUN yum update -y \
# Install Corretto Java JDK (newer more arch independent way)
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

# real copy command (if not caching), uncomment this and change comments of COPY above to work on install script
COPY container_files/ /opt/container_files/
12 changes: 6 additions & 6 deletions Dockerfile2
@@ -16,14 +16,14 @@ ENV GROUPER_VERSION=4.1.0 \

RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
&& echo "NETWORKING=yes" > /etc/sysconfig/network
RUN rm -fr /var/cache/yum/* && yum clean all && yum -y install --setopt=tsflags=nodocs epel-release && yum -y update && \
yum -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man vim rsyslog cron mod_ssl dos2unix cronie && \
yum clean all
RUN rm -fr /var/cache/yum/* && dnf clean all && dnf -y install --setopt=tsflags=nodocs epel-release && dnf -y update && \
dnf -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man vim rsyslog cron mod_ssl dos2unix cronie && \
dnf clean all

RUN yum update -y \
&& yum install -y logrotate python3-pip rsync sudo patch wget tar unzip dos2unix file \
RUN dnf update -y \
&& dnf install -y logrotate python3-pip rsync sudo patch wget tar unzip dos2unix file \
&& pip3 install --upgrade setuptools \
&& yum clean -y all \
&& dnf clean -y all \
&& groupadd -r tomcat \
&& useradd -r -m -s /sbin/nologin -g tomcat tomcat \
&& mkdir -p /opt/container_files
59 changes: 0 additions & 59 deletions Dockerfile_centos

This file was deleted.

@@ -14,7 +14,7 @@ returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi

yum install -y java-$JAVA_VERSION-amazon-corretto-devel
dnf install -y java-$JAVA_VERSION-amazon-corretto-devel
returnCode=$?
echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) yum install -y java-$JAVA_VERSION-amazon-corretto-devel, result: $returnCode"
echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) dnf install -y java-$JAVA_VERSION-amazon-corretto-devel, result: $returnCode"
if [ $returnCode != 0 ]; then exit $returnCode; fi

0 comments on commit c2441c9

Please sign in to comment.