From f86f6ccfc28da045a449a88789baa92b4dbc4eea Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 12:37:55 +0100 Subject: [PATCH 1/8] Update base image --- Dockerfile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 874ca0e..f6e0235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM stakater/pipeline-tools:v1.16.8 +FROM stakater/pipeline-tools:SNAPSHOT-PR-8-11 # Default to UTF-8 file.encoding ENV LANG C.UTF-8 @@ -9,22 +9,17 @@ RUN { \ echo '#!/bin/sh'; \ echo 'set -e'; \ echo; \ - echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \ + echo 'readlink -f /usr/bin/java | sed "s:/bin/java::"'; \ } > /usr/local/bin/docker-java-home \ && chmod +x /usr/local/bin/docker-java-home -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk -ENV PATH $PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin +ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-1.el7_6.x86_64/jre +ENV PATH $PATH:${JAVA_HOME}/jre/bin:/usr/lib/jvm/${JAVA_HOME}/bin ENV JAVA_VERSION 8u191 -ENV JAVA_ALPINE_VERSION 8.191.12-r0 +ENV JAVA_YUM_VERSION 1.8.0.191.b12 RUN set -x \ - && apk add --no-cache \ - openjdk8="$JAVA_ALPINE_VERSION" \ - && [ "$JAVA_HOME" = "$(docker-java-home)" ] - -# Changing user to root to install maven -USER root + yum install -y java-1.8.0-openjdk-${JAVA_YUM_VERSION} # Setting Maven Version that needs to be installed ARG MAVEN_VERSION=3.5.4 From 2bf2f22f28ba3fe51f0e420f873a6fa59eb8c678 Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 12:45:52 +0100 Subject: [PATCH 2/8] Update useradd commands --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6e0235..c0aa930 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN { \ echo 'readlink -f /usr/bin/java | sed "s:/bin/java::"'; \ } > /usr/local/bin/docker-java-home \ && chmod +x /usr/local/bin/docker-java-home -ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-1.el7_6.x86_64/jre +ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-1.el7_6.x86_64 ENV PATH $PATH:${JAVA_HOME}/jre/bin:/usr/lib/jvm/${JAVA_HOME}/bin ENV JAVA_VERSION 8u191 @@ -36,8 +36,9 @@ ENV MAVEN_VERSION=${MAVEN_VERSION} \ PATH=$M2:$PATH # Add jenkins user with hardcoded ID (the one that jenkins expects) -RUN addgroup -g 233 docker && \ - adduser -D -u 10000 -h /home/jenkins -G docker jenkins +RUN groupadd -g 233 docker && \ + adduser -u 10000 -d /home/jenkins -g docker jenkins && \ + passwd -d jenkins # Change to jenkins user USER jenkins From a41dedfc5715c19067f30dc8b467ff465a6c1b09 Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 13:31:19 +0100 Subject: [PATCH 3/8] Update home env var --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index c0aa930..184e09f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,5 +43,7 @@ RUN groupadd -g 233 docker && \ # Change to jenkins user USER jenkins +ENV HOME /home/jenkins + # Define default command, can be overriden by passing an argument when running the container CMD ["mvn","-version"] \ No newline at end of file From 5030e7dad5dd7e26f26e37914d8896b32adc3e7b Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 14:10:53 +0100 Subject: [PATCH 4/8] Update install command --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 184e09f..7650cca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,7 @@ ENV PATH $PATH:${JAVA_HOME}/jre/bin:/usr/lib/jvm/${JAVA_HOME}/bin ENV JAVA_VERSION 8u191 ENV JAVA_YUM_VERSION 1.8.0.191.b12 -RUN set -x \ - yum install -y java-1.8.0-openjdk-${JAVA_YUM_VERSION} +RUN yum install -y java-1.8.0-openjdk-devel-${JAVA_YUM_VERSION} # Setting Maven Version that needs to be installed ARG MAVEN_VERSION=3.5.4 From f8e6a005e94c5f61a0574c381698d592e98a6910 Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 14:33:52 +0100 Subject: [PATCH 5/8] Update base version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7650cca..39df9c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM stakater/pipeline-tools:SNAPSHOT-PR-8-11 +FROM stakater/pipeline-tools:SNAPSHOT-PR-8-12 # Default to UTF-8 file.encoding ENV LANG C.UTF-8 From 40f293cbfdff3b282e2c6717b9820a5f407c2bf3 Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 14:55:34 +0100 Subject: [PATCH 6/8] Update base image version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 39df9c8..fc5c11f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM stakater/pipeline-tools:SNAPSHOT-PR-8-12 +FROM stakater/pipeline-tools:SNAPSHOT-PR-8-13 # Default to UTF-8 file.encoding ENV LANG C.UTF-8 From 4a6897cdb7752a34318435d7036af12d4912e853 Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Wed, 16 Jan 2019 14:56:54 +0100 Subject: [PATCH 7/8] Remove unused code --- Dockerfile | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc5c11f..fac0415 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,18 +3,8 @@ FROM stakater/pipeline-tools:SNAPSHOT-PR-8-13 # Default to UTF-8 file.encoding ENV LANG C.UTF-8 -# add a simple script that can auto-detect the appropriate JAVA_HOME value -# based on whether the JDK or only the JRE is installed -RUN { \ - echo '#!/bin/sh'; \ - echo 'set -e'; \ - echo; \ - echo 'readlink -f /usr/bin/java | sed "s:/bin/java::"'; \ - } > /usr/local/bin/docker-java-home \ - && chmod +x /usr/local/bin/docker-java-home ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-1.el7_6.x86_64 ENV PATH $PATH:${JAVA_HOME}/jre/bin:/usr/lib/jvm/${JAVA_HOME}/bin - ENV JAVA_VERSION 8u191 ENV JAVA_YUM_VERSION 1.8.0.191.b12 From 7e4e23c0dbdc0ae0e33d81d17a99b39b7f163f01 Mon Sep 17 00:00:00 2001 From: Hazim Malik Date: Thu, 17 Jan 2019 09:52:20 +0100 Subject: [PATCH 8/8] Bump pipeline tools version --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fac0415..7ffd814 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM stakater/pipeline-tools:SNAPSHOT-PR-8-13 +FROM stakater/pipeline-tools:v2.0.1 # Default to UTF-8 file.encoding ENV LANG C.UTF-8 diff --git a/Jenkinsfile b/Jenkinsfile index dc46239..8966b53 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,5 +3,5 @@ pushDockerImage { dockerRepositoryURL = "docker.io" - imagePrefix = "3.5.4-jdk1.8-v1.16.8" + imagePrefix = "3.5.4-jdk1.8-v2.0.1" } \ No newline at end of file