perf($OpenJDK): migrate to adoptopenjdk/openjdk11

adoptopenjdk/openjdk11:x86_64-alpine-jre-11.0.9.1_1 [skip ci]
johnnymillergh · Jan 20, 2021 · 9b65893 · 9b65893
1 parent add05b1
commit 9b65893
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/api-gateway/pom.xml b/api-gateway/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${jib-maven-plugin.version}</version>
                 <executions>
                     <!-- Bind `jib:dockerBuild` to a Maven lifecycle `verify`. Jib will build your image directly to a Docker daemon. -->
                     <execution>
@@ -46,8 +46,8 @@
                 </executions>
                 <configuration>
                     <from>
-                        <!-- https://hub.docker.com/_/openjdk?tab=tags&page=1&ordering=last_updated&name=11.0.9.1-jre-slim -->
-                        <image>openjdk:${openjdk.version}</image>
+                        <!-- https://hub.docker.com/r/adoptopenjdk/openjdk11/tags?page=1&ordering=last_updated&name=alpine-jre-11.0.9.1 -->
+                        <image>adoptopenjdk/openjdk11:${adoptopenjdk11.tag}</image>
                     </from>
                     <to>
                         <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>

diff --git a/auth-center/pom.xml b/auth-center/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${jib-maven-plugin.version}</version>
                 <executions>
                     <!-- Bind `jib:dockerBuild` to a Maven lifecycle `verify`. Jib will build your image directly to a Docker daemon. -->
                     <execution>
@@ -46,8 +46,8 @@
                 </executions>
                 <configuration>
                     <from>
-                        <!-- https://hub.docker.com/_/openjdk?tab=tags&page=1&ordering=last_updated&name=11.0.9.1-jre-slim -->
-                        <image>openjdk:${openjdk.version}</image>
+                        <!-- https://hub.docker.com/r/adoptopenjdk/openjdk11/tags?page=1&ordering=last_updated&name=alpine-jre-11.0.9.1 -->
+                        <image>adoptopenjdk/openjdk11:${adoptopenjdk11.tag}</image>
                     </from>
                     <to>
                         <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>

diff --git a/exercise-mis/pom.xml b/exercise-mis/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${jib-maven-plugin.version}</version>
                 <executions>
                     <!-- Bind `jib:dockerBuild` to a Maven lifecycle `verify`. Jib will build your image directly to a Docker daemon. -->
                     <execution>
@@ -46,8 +46,8 @@
                 </executions>
                 <configuration>
                     <from>
-                        <!-- https://hub.docker.com/_/openjdk?tab=tags&page=1&ordering=last_updated&name=11.0.9.1-jre-slim -->
-                        <image>openjdk:${openjdk.version}</image>
+                        <!-- https://hub.docker.com/r/adoptopenjdk/openjdk11/tags?page=1&ordering=last_updated&name=alpine-jre-11.0.9.1 -->
+                        <image>adoptopenjdk/openjdk11:${adoptopenjdk11.tag}</image>
                     </from>
                     <to>
                         <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>

diff --git a/muscle-mis/pom.xml b/muscle-mis/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${jib-maven-plugin.version}</version>
                 <executions>
                     <!-- Bind `jib:dockerBuild` to a Maven lifecycle `verify`. Jib will build your image directly to a Docker daemon. -->
                     <execution>
@@ -46,8 +46,8 @@
                 </executions>
                 <configuration>
                     <from>
-                        <!-- https://hub.docker.com/_/openjdk?tab=tags&page=1&ordering=last_updated&name=11.0.9.1-jre-slim -->
-                        <image>openjdk:${openjdk.version}</image>
+                        <!-- https://hub.docker.com/r/adoptopenjdk/openjdk11/tags?page=1&ordering=last_updated&name=alpine-jre-11.0.9.1 -->
+                        <image>adoptopenjdk/openjdk11:${adoptopenjdk11.tag}</image>
                     </from>
                     <to>
                         <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,8 @@
 
         <!-- Version Definitions. -->
         <java.version>11</java.version>
-        <openjdk.version>11.0.9.1-jre-slim</openjdk.version>
+        <adoptopenjdk11.tag>x86_64-alpine-jre-11.0.9.1_1</adoptopenjdk11.tag>
+        <jib-maven-plugin.version>2.7.1</jib-maven-plugin.version>
         <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
         <spring-content.version>1.0.0.M5</spring-content.version>
         <spring-boot-admin-starter-client.version>2.3.1</spring-boot-admin-starter-client.version>

diff --git a/service-registry/pom.xml b/service-registry/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${jib-maven-plugin.version}</version>
                 <executions>
                     <!-- Bind `jib:dockerBuild` to a Maven lifecycle `verify`. Jib will build your image directly to a Docker daemon. -->
                     <execution>
@@ -46,8 +46,8 @@
                 </executions>
                 <configuration>
                     <from>
-                        <!-- https://hub.docker.com/_/openjdk?tab=tags&page=1&ordering=last_updated&name=11.0.9.1-jre-slim -->
-                        <image>openjdk:${openjdk.version}</image>
+                        <!-- https://hub.docker.com/r/adoptopenjdk/openjdk11/tags?page=1&ordering=last_updated&name=alpine-jre-11.0.9.1 -->
+                        <image>adoptopenjdk/openjdk11:${adoptopenjdk11.tag}</image>
                     </from>
                     <to>
                         <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>

diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${jib-maven-plugin.version}</version>
                 <executions>
                     <!-- Bind `jib:dockerBuild` to a Maven lifecycle `verify`. Jib will build your image directly to a Docker daemon. -->
                     <execution>
@@ -46,8 +46,8 @@
                 </executions>
                 <configuration>
                     <from>
-                        <!-- https://hub.docker.com/_/openjdk?tab=tags&page=1&ordering=last_updated&name=11.0.9.1-jre-slim -->
-                        <image>openjdk:${openjdk.version}</image>
+                        <!-- https://hub.docker.com/r/adoptopenjdk/openjdk11/tags?page=1&ordering=last_updated&name=alpine-jre-11.0.9.1 -->
+                        <image>adoptopenjdk/openjdk11:${adoptopenjdk11.tag}</image>
                     </from>
                     <to>
                         <image>docker.io/ijohnnymiller/${project.parent.artifactId}.${project.artifactId}</image>