From 03d5582d672aeeecb0a25b34c4cd2aaf7aa6ce90 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 12 May 2017 18:15:45 -0500 Subject: [PATCH] comment java in dockerfile --- Dockerfile | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index a199ebb..279a8b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,33 +30,30 @@ ARG SHBLOG=logs/shib-idp # To keep it commented, keep multiple comments on the following line (to prevent other scripts from processing it). ##### ENV TIER_BEACON_OPT_OUT True - - # Uncomment the following commands to download the JDK to your Shibboleth IDP image. # ==> By uncommenting these next 11 lines, you agree to the Oracle Binary Code License Agreement for Java SE (http://www.oracle.com/technetwork/java/javase/terms/license/index.html) -ENV JAVA_OPTS=-Xmx3000m -XX:MaxPermSize=256m -ENV JAVA_VERSION 8u131 -ENV BUILD_VERSION b11 -ENV JAVA_BUNDLE_ID d54c1d3a095b4ff2b6607d096fa80163 -ENV JAVA_HOME /usr/java/latest -RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$JAVA_BUNDLE_ID/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \ - yum -y install /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \ - rm -f /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \ - alternatives --install /usr/bin/java jar $JAVA_HOME/bin/java 200000 && \ - alternatives --install /usr/bin/javaws javaws $JAVA_HOME/bin/javaws 200000 && \ - alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 200000 +# ENV JAVA_OPTS=-Xmx3000m -XX:MaxPermSize=256m +# ENV JAVA_VERSION 8u131 +# ENV BUILD_VERSION b11 +# ENV JAVA_BUNDLE_ID d54c1d3a095b4ff2b6607d096fa80163 +# ENV JAVA_HOME /usr/java/latest +# RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$JAVA_BUNDLE_ID/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \ +# yum -y install /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \ +# rm -f /tmp/jdk-$JAVA_VERSION-$BUILD_VERSION-linux-x64.rpm && \ +# alternatives --install /usr/bin/java jar $JAVA_HOME/bin/java 200000 && \ +# alternatives --install /usr/bin/javaws javaws $JAVA_HOME/bin/javaws 200000 && \ +# alternatives --install /usr/bin/javac javac $JAVA_HOME/bin/javac 200000 # Uncomment the following commands to download the Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files. # ==> By uncommenting these next 8 lines, you agree to the Oracle Binary Code License Agreement for Java SE Platform Products (http://www.oracle.com/technetwork/java/javase/terms/license/index.html) -RUN yum -y install unzip \ - && wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" \ - http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip \ - && echo "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 jce_policy-8.zip" | sha256sum -c - \ - && unzip -oj jce_policy-8.zip UnlimitedJCEPolicyJDK8/local_policy.jar -d $JAVA_HOME/jre/lib/security/ \ - && unzip -oj jce_policy-8.zip UnlimitedJCEPolicyJDK8/US_export_policy.jar -d $JAVA_HOME/jre/lib/security/ \ - && rm jce_policy-8.zip \ - && chmod -R 640 $JAVA_HOME/jre/lib/security/ - +# RUN yum -y install unzip \ +# && wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" \ +# http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip \ +# && echo "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 jce_policy-8.zip" | sha256sum -c - \ +# && unzip -oj jce_policy-8.zip UnlimitedJCEPolicyJDK8/local_policy.jar -d $JAVA_HOME/jre/lib/security/ \ +# && unzip -oj jce_policy-8.zip UnlimitedJCEPolicyJDK8/US_export_policy.jar -d $JAVA_HOME/jre/lib/security/ \ +# && rm jce_policy-8.zip \ +# && chmod -R 640 $JAVA_HOME/jre/lib/security/ RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version && \ rm -rf /usr/local/tomcat/webapps/* && \