From 833df8357f1774d9c64648cc0a93d3e252e53e9e Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Fri, 7 Feb 2020 14:59:12 +0200 Subject: [PATCH 01/10] First test for setting.xml in java base --- java/8/Dockerfile | 68 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index f193f9b..507626e 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,7 +1,71 @@ FROM imqs/ubuntu-base -RUN apt-get update \ - && apt-get install openjdk-8-jre -y +RUN apt-get update && \ + apt-get install openjdk-8-jre -y && \ + rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /root/.m2 +RUN echo " + + + + nexus + * + http://dogmatix:8081/nexus/content/groups/public + + + + + nexus + + + + + central + http://central + true + true + + + + + central + http://central + true + true + + + + + + + nexus + + + + + nexus + user + $Maven_Nexus_User + + + releases + deployment + $Maven_Releases_Deployment + + + snapshots + deployment + $Maven_Snapshots_Deployment + + + github + gerhardvanwyk + $Maven_Github_gerhardvanwyk + + +" > /root/.m2/settings.xml + # Create a symlink to the real log directory RUN mkdir -p /imqsvar From 5343593cd7cd4745cdc7d7dc70401e0527c84ae9 Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Fri, 7 Feb 2020 15:09:56 +0200 Subject: [PATCH 02/10] Addes Maven to java base This will hopefully allow the compilation of java services in docker --- java/8/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 507626e..1beee0b 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,7 +1,9 @@ FROM imqs/ubuntu-base -RUN apt-get update && \ - apt-get install openjdk-8-jre -y && \ +RUN apt update && \ + apt install -y \ + openjdk-8-jre \ + maven && \ rm -rf /var/lib/apt/lists/* RUN mkdir -p /root/.m2 From 8cda01213c5acccd5dd8d12f295fed954abcf77c Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Mon, 10 Feb 2020 08:42:32 +0200 Subject: [PATCH 03/10] Fix inline setting.xml --- java/8/Dockerfile | 122 +++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 60 deletions(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 1beee0b..09a4119 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,3 +1,5 @@ +# docker build -t imqs/java-base:8 . + FROM imqs/ubuntu-base RUN apt update && \ @@ -7,66 +9,66 @@ RUN apt update && \ rm -rf /var/lib/apt/lists/* RUN mkdir -p /root/.m2 -RUN echo " - - - - nexus - * - http://dogmatix:8081/nexus/content/groups/public - - - - - nexus - - - - - central - http://central - true - true - - - - - central - http://central - true - true - - - - - - - nexus - - - - - nexus - user - $Maven_Nexus_User - - - releases - deployment - $Maven_Releases_Deployment - - - snapshots - deployment - $Maven_Snapshots_Deployment - - - github - gerhardvanwyk - $Maven_Github_gerhardvanwyk - - -" > /root/.m2/settings.xml +RUN echo $' \ + \ + \ + \ + nexus \ + * \ + http://dogmatix:8081/nexus/content/groups/public \ + \ + \ + \ + \ + nexus \ + \ + \ + \ + \ + central \ + http://central \ + true \ + true \ + \ + \ + \ + \ + central \ + http://central \ + true \ + true \ + \ + \ + \ + \ + \ + \ + nexus \ + \ + \ + \ + \ + nexus \ + user \ + $Maven_Nexus_User \ + \ + \ + releases \ + deployment \ + $Maven_Releases_Deployment \ + \ + \ + snapshots \ + deployment \ + $Maven_Snapshots_Deployment \ + \ + \ + github \ + gerhardvanwyk \ + $Maven_Github_gerhardvanwyk \ + \ + \ +' > /root/.m2/settings.xml # Create a symlink to the real log directory From 461dc9adddaae896de2f4995d03754d1ffe9f7b1 Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Mon, 10 Feb 2020 13:40:31 +0200 Subject: [PATCH 04/10] Adds build-args for passwords --- java/8/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 09a4119..ec9e900 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t imqs/java-base:8 . +# docker build -t imqs/java-base:8-test --build-arg Maven_Nexus_User=$Maven_Nexus_User --build-arg Maven_Releases_Deployment=$Maven_Releases_Deployment --build-arg Maven_Snapshots_Deployment=$Maven_Snapshots_Deployment --build-arg Maven_Github_gerhardvanwyk=$Maven_Github_gerhardvanwyk . FROM imqs/ubuntu-base @@ -8,8 +8,12 @@ RUN apt update && \ maven && \ rm -rf /var/lib/apt/lists/* +ARG Maven_Nexus_User +ARG Maven_Releases_Deployment +ARG Maven_Snapshots_Deployment +ARG Maven_Github_gerhardvanwyk RUN mkdir -p /root/.m2 -RUN echo $' \ +RUN echo " \ \ \ \ @@ -68,8 +72,7 @@ RUN echo $' \ $Maven_Github_gerhardvanwyk \ \ \ -' > /root/.m2/settings.xml - +" > /root/.m2/settings.xml # Create a symlink to the real log directory RUN mkdir -p /imqsvar From f2cd9be1d4a066b8f69c514f3aa75edf8c4d081f Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Mon, 10 Feb 2020 17:22:51 +0200 Subject: [PATCH 05/10] Updates maven version --- java/8/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index ec9e900..422e47d 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -5,9 +5,14 @@ FROM imqs/ubuntu-base RUN apt update && \ apt install -y \ openjdk-8-jre \ - maven && \ rm -rf /var/lib/apt/lists/* +RUN wget https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz -P /tmp && \ + tar xf /tmp/apache-maven-*.tar.gz -C /opt && rm /tmp/apache-maven-*.tar.gz && \ + mv /opt/apache-maven-* /opt/maven +ENV MAVEN_HOME=/opt/maven +ENV PATH=${MAVEN_HOME}/bin:${PATH} + ARG Maven_Nexus_User ARG Maven_Releases_Deployment ARG Maven_Snapshots_Deployment From 580c597ec155c94c98725a598d2f4c5e828e8bbc Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Mon, 10 Feb 2020 17:25:20 +0200 Subject: [PATCH 06/10] Fixed dockerfile --- java/8/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 422e47d..dec036d 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -4,7 +4,7 @@ FROM imqs/ubuntu-base RUN apt update && \ apt install -y \ - openjdk-8-jre \ + openjdk-8-jre && \ rm -rf /var/lib/apt/lists/* RUN wget https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz -P /tmp && \ From 2d48e81722ebea3842455dcb33c24bda84c7e850 Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Mon, 10 Feb 2020 17:30:48 +0200 Subject: [PATCH 07/10] Adds wget to java-base --- java/8/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index dec036d..e3a3aac 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -4,7 +4,8 @@ FROM imqs/ubuntu-base RUN apt update && \ apt install -y \ - openjdk-8-jre && \ + openjdk-8-jre \ + wget && \ rm -rf /var/lib/apt/lists/* RUN wget https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz -P /tmp && \ From 84ad53d748a756c6fb47e12780b4fb8aa1a20773 Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Mon, 10 Feb 2020 17:42:19 +0200 Subject: [PATCH 08/10] Changed jre to jdk for java-base --- java/8/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index e3a3aac..28a0372 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -4,7 +4,7 @@ FROM imqs/ubuntu-base RUN apt update && \ apt install -y \ - openjdk-8-jre \ + openjdk-8-jdk \ wget && \ rm -rf /var/lib/apt/lists/* From 287487ac46bcbacda4bb9aaf1247e28f652c0bfa Mon Sep 17 00:00:00 2001 From: FritzOnFire Date: Thu, 5 Mar 2020 09:01:21 +0200 Subject: [PATCH 09/10] Adds seperate dockerfile for java-base This will allow developers to create a java-base image useing their local .m2 folder --- java/8/Dockerfile-local-m2 | 22 ++++++++++++++++++++++ java/8/build-local-m2 | 6 ++++++ java/8/readme.md | 10 ++++++++++ 3 files changed, 38 insertions(+) create mode 100755 java/8/Dockerfile-local-m2 create mode 100755 java/8/build-local-m2 create mode 100644 java/8/readme.md diff --git a/java/8/Dockerfile-local-m2 b/java/8/Dockerfile-local-m2 new file mode 100755 index 0000000..bceae5c --- /dev/null +++ b/java/8/Dockerfile-local-m2 @@ -0,0 +1,22 @@ +# docker build -t imqs/java-base:8-test . + +FROM imqs/ubuntu-base + +RUN apt update && \ + apt install -y \ + openjdk-8-jdk \ + wget && \ + rm -rf /var/lib/apt/lists/* + +RUN wget https://www-us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz -P /tmp && \ + tar xf /tmp/apache-maven-*.tar.gz -C /opt && rm /tmp/apache-maven-*.tar.gz && \ + mv /opt/apache-maven-* /opt/maven +ENV MAVEN_HOME=/opt/maven +ENV PATH=${MAVEN_HOME}/bin:${PATH} + +RUN mkdir -p /root/.m2 +COPY ./ /root/.m2 + +# Create a symlink to the real log directory +RUN mkdir -p /imqsvar +RUN ln -s /var/log/imqs /imqsvar/logs diff --git a/java/8/build-local-m2 b/java/8/build-local-m2 new file mode 100755 index 0000000..3facfbb --- /dev/null +++ b/java/8/build-local-m2 @@ -0,0 +1,6 @@ +dockerfileDir=${PWD} + +cd /home/`whoami`/.m2 && \ +sudo docker build -t imqs/java-base:8-test -f ${dockerfileDir}/Dockerfile-local-m2 . + +cd $dockerfileDir diff --git a/java/8/readme.md b/java/8/readme.md new file mode 100644 index 0000000..6ef49bf --- /dev/null +++ b/java/8/readme.md @@ -0,0 +1,10 @@ +# Docker Local m2 + +If you are a developer and you have made changes to your local .m2 folder and +you are not satisfied with just testing your service natively then this is the +dockerfile for you. + +By running the script called `build-local-m2` you can build the `java-base` +image using your own `.m2` folder in your home directory. You can then build +the docker image for java service and it will automatically use the local m2 +docker image as a base. From 1cf32eb0e6151de2e89c6f5a999cf8caabc5deac Mon Sep 17 00:00:00 2001 From: Jaco Vosloo Date: Sun, 5 Apr 2020 15:50:46 +0200 Subject: [PATCH 10/10] Update Dockerfile Dogmatix lookup fails, replaced with IP. --- java/8/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/8/Dockerfile b/java/8/Dockerfile index 28a0372..250db7e 100755 --- a/java/8/Dockerfile +++ b/java/8/Dockerfile @@ -25,7 +25,7 @@ RUN echo " \ \ nexus \ * \ - http://dogmatix:8081/nexus/content/groups/public \ + http://192.168.4.40:8081/nexus/content/groups/public \ \ \ \