From 9f258f7b10648eddebe6015fa0527ed7ea3a7f2f Mon Sep 17 00:00:00 2001 From: Arthur De Magalhaes Date: Mon, 4 Nov 2019 15:48:12 -0500 Subject: [PATCH 1/2] Updating UBI images Signed-off-by: Arthur De Magalhaes --- ibmjava/8/jre/ubi-min/Dockerfile | 4 ---- ibmjava/8/jre/ubi/Dockerfile | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/ibmjava/8/jre/ubi-min/Dockerfile b/ibmjava/8/jre/ubi-min/Dockerfile index 9993c24..76bb7ad 100644 --- a/ibmjava/8/jre/ubi-min/Dockerfile +++ b/ibmjava/8/jre/ubi-min/Dockerfile @@ -38,7 +38,6 @@ ENV JAVA_VERSION 1.8.0_sr5fp41 RUN set -eux; \ microdnf -y install shadow-utils; \ - useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ amd64|x86_64) \ @@ -73,7 +72,6 @@ RUN set -eux; \ rm -f /tmp/index.yml; \ mkdir -p /licenses; \ cp /opt/ibm/java/license_en.txt /licenses; \ - chown -R 1001:0 /opt/ibm/java; \ microdnf -y remove shadow-utils; \ microdnf clean all; \ rm -f /tmp/ibm-java.bin; @@ -81,5 +79,3 @@ RUN set -eux; \ ENV JAVA_HOME=/opt/ibm/java/jre \ PATH=/opt/ibm/java/jre/bin:$PATH \ IBM_JAVA_OPTIONS="-XX:+UseContainerSupport" - -USER 1001 diff --git a/ibmjava/8/jre/ubi/Dockerfile b/ibmjava/8/jre/ubi/Dockerfile index 996e898..9a995c5 100644 --- a/ibmjava/8/jre/ubi/Dockerfile +++ b/ibmjava/8/jre/ubi/Dockerfile @@ -37,7 +37,6 @@ LABEL org.opencontainers.image.authors="Jayashree Gopi " \ ENV JAVA_VERSION 1.8.0_sr5fp41 RUN set -eux; \ - useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ amd64|x86_64) \ @@ -72,11 +71,8 @@ RUN set -eux; \ rm -f /tmp/index.yml; \ mkdir -p /licenses; \ cp /opt/ibm/java/license_en.txt /licenses; \ - chown -R 1001:0 /opt/ibm/java; \ rm -f /tmp/ibm-java.bin; ENV JAVA_HOME=/opt/ibm/java/jre \ PATH=/opt/ibm/java/jre/bin:$PATH \ - IBM_JAVA_OPTIONS="-XX:+UseContainerSupport" - -USER 1001 + IBM_JAVA_OPTIONS="-XX:+UseContainerSupport" \ No newline at end of file From d5d21a74816b408f46f66b7fca1c1f6f2542871e Mon Sep 17 00:00:00 2001 From: Arthur De Magalhaes Date: Wed, 20 Nov 2019 14:07:47 -0500 Subject: [PATCH 2/2] reverting ubi-min changes Signed-off-by: Arthur De Magalhaes --- ibmjava/8/jre/ubi-min/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ibmjava/8/jre/ubi-min/Dockerfile b/ibmjava/8/jre/ubi-min/Dockerfile index 76bb7ad..b013166 100644 --- a/ibmjava/8/jre/ubi-min/Dockerfile +++ b/ibmjava/8/jre/ubi-min/Dockerfile @@ -38,6 +38,7 @@ ENV JAVA_VERSION 1.8.0_sr5fp41 RUN set -eux; \ microdnf -y install shadow-utils; \ + useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default; \ ARCH="$(uname -m)"; \ case "${ARCH}" in \ amd64|x86_64) \ @@ -72,6 +73,7 @@ RUN set -eux; \ rm -f /tmp/index.yml; \ mkdir -p /licenses; \ cp /opt/ibm/java/license_en.txt /licenses; \ + chown -R 1001:0 /opt/ibm/java; \ microdnf -y remove shadow-utils; \ microdnf clean all; \ rm -f /tmp/ibm-java.bin; @@ -79,3 +81,5 @@ RUN set -eux; \ ENV JAVA_HOME=/opt/ibm/java/jre \ PATH=/opt/ibm/java/jre/bin:$PATH \ IBM_JAVA_OPTIONS="-XX:+UseContainerSupport" + +USER 1001 \ No newline at end of file