[GitHub] jonpspri closed pull request #3408: Fine-tuning Dockerfile for alpine 'scala' image

[GitBox <gi...@apache.org>]

jonpspri closed pull request #3408: Fine-tuning Dockerfile for alpine 'scala' image
URL: https://github.com/apache/incubator-openwhisk/pull/3408
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/common/scala/Dockerfile b/common/scala/Dockerfile
index 17849dc9fd..3fffa3b89f 100644
--- a/common/scala/Dockerfile
+++ b/common/scala/Dockerfile
@@ -15,19 +15,23 @@ ENV JRE_HOME ${JAVA_HOME}/jre
 ENV PATH $JAVA_HOME/bin:$PATH
 
 
-RUN apk upgrade --update && \
-    apk add --update libstdc++ curl ca-certificates bash sed && \
+RUN apk add --update --no-cache libstdc++ curl ca-certificates bash sed && \
     update-ca-certificates && \
-    for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
+    for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do \
+        curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk \
+    ; done && \
     apk add --allow-untrusted /tmp/*.apk && \
     rm -v /tmp/*.apk && \
     ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) && \
     echo "export LANG=${LANG}" > /etc/profile.d/locale.sh && \
     /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
-    curl --silent --location --retry 3 --header "Cookie: oraclelicense=accept-securebackup-cookie" \
-    http://download.oracle.com/otn-pub/java/jdk/"${VERSION}"u"${UPDATE}"-b"${BUILD}"/"${SIG}"/jdk-"${VERSION}"u"${UPDATE}"-linux-x64.tar.gz \
-    | tar xz -C /tmp && \
-    mkdir -p /usr/lib/jvm && mv /tmp/jdk1.${VERSION}.0_${UPDATE} "${JAVA_HOME}" && \
+    ( cd /tmp && \
+      curl -O --silent --location --retry 3 --header "Cookie: oraclelicense=accept-securebackup-cookie" \
+          http://download.oracle.com/otn-pub/java/jdk/"${VERSION}"u"${UPDATE}"-b"${BUILD}"/"${SIG}"/jdk-"${VERSION}"u"${UPDATE}"-linux-x64.tar.gz && \
+      tar xzf "/tmp/jdk-${VERSION}u${UPDATE}-linux-x64.tar.gz" &&  \
+      rm "/tmp/jdk-${VERSION}u${UPDATE}-linux-x64.tar.gz" \
+    ) && \
+    mkdir -p /usr/lib/jvm && mv "/tmp/jdk1.${VERSION}.0_${UPDATE}" "${JAVA_HOME}" && \
     rm -rf "$JAVA_HOME"/*src.zip \
            "$JAVA_HOME"/lib/missioncontrol \
            "$JAVA_HOME"/lib/visualvm \
@@ -75,4 +79,4 @@ COPY transformEnvironment.sh /
 RUN chmod +x transformEnvironment.sh
 
 COPY copyJMXFiles.sh /
-RUN chmod +x copyJMXFiles.sh
\ No newline at end of file
+RUN chmod +x copyJMXFiles.sh


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services