Merge pull request #68 from rhuss/master

Update versions for java and base images
fabric8io-images · Nov 4, 2021 · a288fdb · a288fdb
2 parents 51bed01 + 3a9b65a
commit a288fdb
Show file tree

Hide file tree

Showing 48 changed files with 96 additions and 96 deletions.
diff --git a/fish-pepper.yml b/fish-pepper.yml
@@ -3,7 +3,7 @@
 # Versions of support libs
 version:
   agentBond: "1.2.0"
-  jolokia: "1.6.2"
+  jolokia: "1.7.1"
   jmxExporter: "0.3.1"
 
 # Who to blame
@@ -19,7 +19,7 @@ blocks:
   # run-java.sh for starting up Java processes
   - type: "git"
     url: "https://github.com/fabric8io-images/run-java-sh.git"
-    tag: v1.3.7
+    tag: v1.3.8
   # agent bond for export Jolokia and jmx_exporter data
   - type: "git"
     url: "https://github.com/fabric8io/agent-bond.git"

diff --git a/images.yml b/images.yml
@@ -5,7 +5,7 @@ fish-pepper:
     - version
     - type
   name: "fabric8/java"
-  build: "1.8.1"
+  build: "1.9.0"
 
 # Used for escaping in 'agent-bond-opts' where the same delimiters are used
 abSepOpen: "{{"
@@ -17,33 +17,33 @@ config:
       agent: "agent-bond"
       baseDir: "/deployments"
     alpine:
-      from: "alpine:3.11"
-      version: "3.11"
+      from: "alpine:3.11.12"
+      version: "3.11.12"
       description: "Alpine"
       javaPackage:
-        7: 7.221.2.6.18-r0
-        8: 8.242.08-r0
+        7: 7.281.2.6.24-r0
+        8: 8.275.01-r0
         11: 11.0.5_p10-r0
     centos:
-      from: "centos:7.8.2003"
+      from: "centos:centos7.9.2009"
       createUser: true
       user: "jboss"
       version: "7"
       description: "CentOS"
       javaPackage:
         7: 1.7.0.261-2.6.22.2.el7_8
-        8: 1.8.0.262.b10-0.el7_8
-        11: 11.0.8.10-0.el7_8
+        8: 1.8.0.312.b07-1.el7_9
+        11: 11.0.13.0.8-1.el7_9
     ubi:
-      from: "registry.access.redhat.com/ubi8/ubi-minimal:8.2-267"
+      from: "registry.access.redhat.com/ubi8/ubi-minimal:8.4-212"
       createUser: false
       createUBIUser: true
       ubiUser: 1001
-      version: "8.1"
+      version: "8.4"
       description: "UBI"
       javaPackage:
-        8: 1.8.0.252.b09-2.el8_1
-        11: 11.0.7.10-1.el8_1
+        8: 1.8.0.312.b07-1.el8_4
+        11: 11.0.13.0.8-1.el8_4
     jboss:
       deprecated: true
       from: "jboss/base-jdk"

diff --git a/images/alpine/openjdk11/jdk/Dockerfile b/images/alpine/openjdk11/jdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.11.12
 
 USER root
 

diff --git a/images/alpine/openjdk11/jdk/README.md b/images/alpine/openjdk11/jdk/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -179,6 +179,6 @@ mvn clean install
 
 ### Versions:
 
-* Base-Image: **Alpine 3.11**
+* Base-Image: **Alpine 3.11.12**
 * Java: **OpenJDK 11 11** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/alpine/openjdk11/jdk/run-java.sh b/images/alpine/openjdk11/jdk/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/alpine/openjdk11/jre/Dockerfile b/images/alpine/openjdk11/jre/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.11.12
 
 USER root
 

diff --git a/images/alpine/openjdk11/jre/README.md b/images/alpine/openjdk11/jre/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -179,6 +179,6 @@ mvn clean install
 
 ### Versions:
 
-* Base-Image: **Alpine 3.11**
+* Base-Image: **Alpine 3.11.12**
 * Java: **OpenJDK 11 11** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/alpine/openjdk11/jre/run-java.sh b/images/alpine/openjdk11/jre/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/alpine/openjdk7/jdk/Dockerfile b/images/alpine/openjdk7/jdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.11.12
 
 USER root
 
@@ -13,7 +13,7 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN apk add --update \
     curl \
-    openjdk7=7.221.2.6.18-r0 \
+    openjdk7=7.281.2.6.24-r0 \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 

diff --git a/images/alpine/openjdk7/jdk/README.md b/images/alpine/openjdk7/jdk/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -179,6 +179,6 @@ mvn clean install
 
 ### Versions:
 
-* Base-Image: **Alpine 3.11**
+* Base-Image: **Alpine 3.11.12**
 * Java: **OpenJDK 7 1.7.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/alpine/openjdk7/jdk/run-java.sh b/images/alpine/openjdk7/jdk/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/alpine/openjdk7/jre/Dockerfile b/images/alpine/openjdk7/jre/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.11.12
 
 USER root
 
@@ -13,7 +13,7 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN apk add --update \
     curl \
-    openjdk7-jre=7.221.2.6.18-r0 \
+    openjdk7-jre=7.281.2.6.24-r0 \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 

diff --git a/images/alpine/openjdk7/jre/README.md b/images/alpine/openjdk7/jre/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -179,6 +179,6 @@ mvn clean install
 
 ### Versions:
 
-* Base-Image: **Alpine 3.11**
+* Base-Image: **Alpine 3.11.12**
 * Java: **OpenJDK 7 1.7.0** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/alpine/openjdk7/jre/run-java.sh b/images/alpine/openjdk7/jre/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/alpine/openjdk8/jdk/Dockerfile b/images/alpine/openjdk8/jdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.11.12
 
 USER root
 
@@ -13,7 +13,7 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN apk add --update \
     curl \
-    openjdk8=8.242.08-r0 \
+    openjdk8=8.275.01-r0 \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 

diff --git a/images/alpine/openjdk8/jdk/README.md b/images/alpine/openjdk8/jdk/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -179,6 +179,6 @@ mvn clean install
 
 ### Versions:
 
-* Base-Image: **Alpine 3.11**
+* Base-Image: **Alpine 3.11.12**
 * Java: **OpenJDK 8 1.8.0** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/alpine/openjdk8/jdk/run-java.sh b/images/alpine/openjdk8/jdk/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/alpine/openjdk8/jre/Dockerfile b/images/alpine/openjdk8/jre/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.11.12
 
 USER root
 
@@ -13,7 +13,7 @@ ENV JAVA_APP_DIR=/deployments \
 # according to http://www.2uo.de/myths-about-urandom/
 RUN apk add --update \
     curl \
-    openjdk8-jre=8.242.08-r0 \
+    openjdk8-jre=8.275.01-r0 \
  && rm /var/cache/apk/* \
  && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/jre/lib/security/java.security
 

diff --git a/images/alpine/openjdk8/jre/README.md b/images/alpine/openjdk8/jre/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -179,6 +179,6 @@ mvn clean install
 
 ### Versions:
 
-* Base-Image: **Alpine 3.11**
+* Base-Image: **Alpine 3.11.12**
 * Java: **OpenJDK 8 1.8.0** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/alpine/openjdk8/jre/run-java.sh b/images/alpine/openjdk8/jre/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/centos/openjdk11/jdk/Dockerfile b/images/centos/openjdk11/jdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.8.2003
+FROM centos:centos7.9.2009
 
 USER root
 
@@ -12,8 +12,8 @@ ENV JAVA_APP_DIR=/deployments \
 # /dev/urandom is used as random source, which is prefectly safe
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
-       java-11-openjdk-11.0.8.10-0.el7_8 \ 
-       java-11-openjdk-devel-11.0.8.10-0.el7_8 \ 
+       java-11-openjdk-11.0.13.0.8-1.el7_9 \ 
+       java-11-openjdk-devel-11.0.13.0.8-1.el7_9 \ 
     && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 

diff --git a/images/centos/openjdk11/jdk/README.md b/images/centos/openjdk11/jdk/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -181,4 +181,4 @@ mvn clean install
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 11 11** (Java Development Kit (JDK))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/centos/openjdk11/jdk/run-java.sh b/images/centos/openjdk11/jdk/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/centos/openjdk11/jre/Dockerfile b/images/centos/openjdk11/jre/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.8.2003
+FROM centos:centos7.9.2009
 
 USER root
 
@@ -12,7 +12,7 @@ ENV JAVA_APP_DIR=/deployments \
 # /dev/urandom is used as random source, which is prefectly safe
 # according to http://www.2uo.de/myths-about-urandom/
 RUN yum install -y \
-       java-11-openjdk-11.0.8.10-0.el7_8 \ 
+       java-11-openjdk-11.0.13.0.8-1.el7_9 \ 
     && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \
     && yum clean all
 

diff --git a/images/centos/openjdk11/jre/README.md b/images/centos/openjdk11/jre/README.md
@@ -24,7 +24,7 @@ For example, the following snippet can be added to a script starting up your Jav
 
 The following versions and defaults are used:
 
-* [Jolokia](http://www.jolokia.org) : version **1.6.2** and port **8778**
+* [Jolokia](http://www.jolokia.org) : version **1.7.1** and port **8778**
 * [jmx_exporter](https://github.com/prometheus/jmx_exporter): version **0.3.1** and port **9779**
 
 You can influence the behaviour of `agent-bond-opts` by setting various environment variables:
@@ -181,4 +181,4 @@ mvn clean install
 
 * Base-Image: **CentOS 7**
 * Java: **OpenJDK 11 11** (Java Runtime Environment (JRE))
-* Agent-Bond: **1.2.0** (Jolokia 1.6.2, jmx_exporter 0.3.1)
+* Agent-Bond: **1.2.0** (Jolokia 1.7.1, jmx_exporter 0.3.1)
diff --git a/images/centos/openjdk11/jre/run-java.sh b/images/centos/openjdk11/jre/run-java.sh
@@ -201,7 +201,7 @@ init_java_major_version() {
         else
             full_version=$(java -version 2>&1 | head -1 | sed -e 's/.*\"\([0-9.]\{1,\}\).*/\1/')
         fi
-        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
+        export JAVA_MAJOR_VERSION=$(echo $full_version | sed -e 's/[^0-9]*\(1\.\)\{0,1\}\([0-9]\{1,\}\).*/\2/')
     fi
 }
 

diff --git a/images/centos/openjdk7/jdk/Dockerfile b/images/centos/openjdk7/jdk/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.8.2003
+FROM centos:centos7.9.2009
 
 USER root