diff --git a/Dockerfile b/Dockerfile index 6dfadad0..531da553 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,8 +35,8 @@ 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 $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 + && /opt/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh $JAVA_HOME $GROUPER_VERSION \ + && /opt/container_files/docker-build-bin/containerDockerfileInstall.sh $JAVA_HOME $GROUPER_VERSION # testing container diff --git a/Dockerfile2 b/Dockerfile2 index da2c8f1f..03ac5d23 100644 --- a/Dockerfile2 +++ b/Dockerfile2 @@ -44,7 +44,7 @@ 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 $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/containerDockerfileInstallGrouper.sh $JAVA_HOME $GROUPER_VERSION # real copy command (if not caching), uncomment this and change comments of COPY above to work on install script @@ -54,7 +54,7 @@ RUN cd /tmp \ && mkdir /etc/shibboleth \ && 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/containerDockerfileInstall.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION + && /opt/container_files/docker-build-bin/containerDockerfileInstall.sh $JAVA_HOME $GROUPER_VERSION # testing container diff --git a/container_files/api/edu/internet2/middleware/grouper/app/provisioning/GrouperProvisioningCompare.class b/container_files/api/edu/internet2/middleware/grouper/app/provisioning/GrouperProvisioningCompare.class deleted file mode 100644 index 0b051aca..00000000 Binary files a/container_files/api/edu/internet2/middleware/grouper/app/provisioning/GrouperProvisioningCompare.class and /dev/null differ diff --git a/container_files/docker-build-bin/containerDockerfileInstall.sh b/container_files/docker-build-bin/containerDockerfileInstall.sh index f4a01de7..bf44d170 100644 --- a/container_files/docker-build-bin/containerDockerfileInstall.sh +++ b/container_files/docker-build-bin/containerDockerfileInstall.sh @@ -1,9 +1,9 @@ #!/bin/bash -# $1 ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-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_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto +# $2 ARG GROUPER_VERSION=2.6.14 +JAVA_HOME=$1 +GROUPER_VERSION=$2 chmod 775 $(find /opt/container_files -type d) returnCode=$? @@ -45,14 +45,14 @@ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -mv /opt/grouper/$4/grouperInstaller.jar /opt/grouper/ +mv /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/ returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$4/grouperInstaller.jar /opt/grouper/, result: $returnCode" +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -mv /opt/grouper/$4/container/tomee/* /opt/tomee/ +mv /opt/grouper/$GROUPER_VERSION/container/tomee/* /opt/tomee/ returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$4/container/tomee/* /opt/tomee/, result: $returnCode" +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$GROUPER_VERSION/container/tomee/* /opt/tomee/, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi mkdir -p /opt/tomee/temp @@ -65,14 +65,14 @@ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/work, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -mv /opt/grouper/$4/container/webapp/* /opt/grouper/grouperWebapp/ +mv /opt/grouper/$GROUPER_VERSION/container/webapp/* /opt/grouper/grouperWebapp/ returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$4/container/webapp/* /opt/grouper/grouperWebapp/, result: $returnCode" +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$GROUPER_VERSION/container/webapp/* /opt/grouper/grouperWebapp/, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -rm -rf /opt/grouper/$4 +rm -rf /opt/grouper/$GROUPER_VERSION returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/grouper/$4, result: $returnCode" +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/grouper/$GROUPER_VERSION, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi rm -rf /opt/tomee/webapps/docs/ /opt/tomee/webapps/host-manager/ /opt/tomee/webapps/manager/ /opt/tomee/logs/* /opt/tomee/temp/* /opt/tomee/work/* /opt/tomee/conf/logging.properties @@ -80,6 +80,11 @@ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/tomee/webapps/docs/ /opt/tomee/webapps/host-manager/ /opt/tomee/webapps/manager/ /opt/tomee/logs/* /opt/tomee/temp/* /opt/tomee/work/*\ /opt/tomee/conf/logging.properties, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi +cp -R /opt/container_files/grouperWebapp/* /opt/grouper/grouperWebapp +returnCode=$? +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/grouperWebapp/* /opt/grouper/grouperWebapp, result: $returnCode" +if [ $returnCode != 0 ]; then exit $returnCode; fi + cp -R /opt/container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/, result: $returnCode" @@ -105,9 +110,9 @@ returnCode=$? echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /etc/alternatives/java, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi -ln -s $3/bin/java /etc/alternatives/java +ln -s $JAVA_HOME/bin/java /etc/alternatives/java returnCode=$? -echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) ln -s $3/bin/java /etc/alternatives/java, result: $returnCode" +echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) ln -s $JAVA_HOME/bin/java /etc/alternatives/java, result: $returnCode" if [ $returnCode != 0 ]; then exit $returnCode; fi mv /opt/container_files/usr-local-bin/* /usr/local/bin/ diff --git a/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh b/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh index ef8da11a..3fc531d3 100644 --- a/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh +++ b/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh @@ -1,9 +1,9 @@ #!/bin/bash -# $1 ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-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_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto +# $2 ARG GROUPER_VERSION=2.6.14 +JAVA_HOME=$1 +GROUPER_VERSION=$2 mv /opt/container_files/tier-support /opt returnCode=$? diff --git a/container_files/grouperWebapp/WEB-INF/libWs/jersey-container-servlet-2.36.jar b/container_files/grouperWebapp/WEB-INF/libWs/jersey-container-servlet-2.36.jar new file mode 100644 index 00000000..8e82349b Binary files /dev/null and b/container_files/grouperWebapp/WEB-INF/libWs/jersey-container-servlet-2.36.jar differ