2.6.17

docker · Nov 1, 2022 · a0aafae · a0aafae
1 parent ca015d6
commit a0aafae
Showing 4 changed files with 15 additions and 42 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=2.6.16 \
+ENV GROUPER_VERSION=2.6.17 \
     GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
     JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
@@ -26,17 +26,15 @@ RUN yum update -y \
 # Install Corretto Java JDK
 #Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
 
-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
-
+ARG JAVA_VERSION=1.8.0
 
 # 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/
 
 RUN cd /tmp \
     && chmod +x /opt/container_files/docker-build-bin/*.sh \
     && /opt/container_files/docker-build-bin/containerDockerfileInstallDos2unix.sh /opt/container_files \
-    && /opt/container_files/docker-build-bin/containerDockerfileInstallJava.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION \
+    && /opt/container_files/docker-build-bin/containerDockerfileInstallJava.sh $JAVA_VERSION \
     && /opt/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION \
     && /opt/container_files/docker-build-bin/containerDockerfileInstall.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION
 

diff --git a/Dockerfile2 b/Dockerfile2
@@ -8,7 +8,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=2.6.16 \
+ENV GROUPER_VERSION=2.6.17 \
     GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
     JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
@@ -31,10 +31,7 @@ RUN yum update -y \
 # Install Corretto Java JDK
 #Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
 
-#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
-ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-linux-jdk.rpm
-ARG CORRETTO_RPM=amazon-corretto-8-aarch64-linux-jdk.rpm
+ARG JAVA_VERSION=1.8.0
 
 
 COPY container_files/docker-build-bin /opt/container_files/docker-build-bin/
@@ -46,7 +43,7 @@ COPY container_files/tier-support /opt/container_files/tier-support/
 RUN cd /tmp \
     && chmod +x /opt/container_files/docker-build-bin/*.sh \
     && /opt/container_files/docker-build-bin/containerDockerfileInstallDos2unix.sh /opt/container_files \
-    && /opt/container_files/docker-build-bin/containerDockerfileInstallJava.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION \
+    && /opt/container_files/docker-build-bin/containerDockerfileInstallJava.sh  $JAVA_VERSION \
     && /opt/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION 
 
 

diff --git a/container_files/docker-build-bin/containerDockerfileInstallJava.sh b/container_files/docker-build-bin/containerDockerfileInstallJava.sh
@@ -1,37 +1,20 @@
 #!/bin/bash
 
-# $1 ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
-# $1 ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-linux-jdk.rpm
-# $2 ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
-# $3 ARG JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
-# $4 ARG GROUPER_VERSION=2.6.14
+# $1 ARG JAVA_VERSION=1.8.0
+JAVA_VERSION=$1
 
-CORRETTO_URL_PERM=$1
-CORRETTO_RPM=$2
-JAVA_HOME=$3
-GROUPER_VERSION=$4
 
-curl -O -L $CORRETTO_URL_PERM
+rpm --import https://yum.corretto.aws/corretto.key
 returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) curl -O -L $CORRETTO_URL_PERM, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) rpm --import https://yum.corretto.aws/corretto.key, result: $returnCode"
 if [ $returnCode != 0 ]; then exit $returnCode; fi
 
-rpm --import /opt/container_files/java-corretto/corretto-signing-key.pub
+curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo
 returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) rpm --import /opt/container_files/java-corretto/corretto-signing-key.pub corretto-signing-key.pub, result: $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
 
-rpm -K $CORRETTO_RPM
+yum install -y java-$JAVA_VERSION-amazon-corretto-devel
 returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) rpm -K $CORRETTO_RPM, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-rpm -i $CORRETTO_RPM
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) rpm -i $CORRETTO_RPM, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-rm -r $CORRETTO_RPM
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) rm -r $CORRETTO_RPM, result: $returnCode"
+echo "grouperDockerfile; INFO: (containerDockerfileInstallJava.sh) yum install -y java-$JAVA_VERSION-amazon-corretto-devel, result: $returnCode"
 if [ $returnCode != 0 ]; then exit $returnCode; fi
diff --git a/container_files/usr-local-bin/librarySetupFiles.sh b/container_files/usr-local-bin/librarySetupFiles.sh
@@ -5,12 +5,7 @@ setupFiles_linkGrouperSecrets() {
         local label_file=`basename $filepath`
         local file=$(echo $label_file| cut -d'_' -f 2)
 
-        if [[ $label_file == grouper_* ]]; then
-            ln -sf /run/secrets/$label_file /opt/grouper/grouperWebapp/WEB-INF/classes/$file
-            returnCode=$?
-            echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_linkGrouperSecrets) ln -sf /run/secrets/$label_file /opt/grouper/grouperWebapp/WEB-INF/classes/$file, result: $returnCode"
-            if [ $returnCode != 0 ]; then exit $returnCode; fi
-        elif [[ $label_file == shib_* ]]; then
+        if [[ $label_file == shib_* ]]; then
             ln -sf /run/secrets/$label_file /etc/shibboleth/$file
             returnCode=$?
             echo "grouperContainer; INFO: (librarySetupFiles.sh-setupFiles_linkGrouperSecrets) ln -sf /run/secrets/$label_file /etc/shibboleth/$file, result: $returnCode"