From 3a9b65a4b6cad3a324d313b84aa34d42a1437034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Hu=C3=9F?= Date: Thu, 4 Nov 2021 09:14:23 +0100 Subject: [PATCH] Update versions for java and base images --- fish-pepper.yml | 4 ++-- images.yml | 24 ++++++++++++------------ images/alpine/openjdk11/jdk/Dockerfile | 2 +- images/alpine/openjdk11/jdk/README.md | 6 +++--- images/alpine/openjdk11/jdk/run-java.sh | 2 +- images/alpine/openjdk11/jre/Dockerfile | 2 +- images/alpine/openjdk11/jre/README.md | 6 +++--- images/alpine/openjdk11/jre/run-java.sh | 2 +- images/alpine/openjdk7/jdk/Dockerfile | 4 ++-- images/alpine/openjdk7/jdk/README.md | 6 +++--- images/alpine/openjdk7/jdk/run-java.sh | 2 +- images/alpine/openjdk7/jre/Dockerfile | 4 ++-- images/alpine/openjdk7/jre/README.md | 6 +++--- images/alpine/openjdk7/jre/run-java.sh | 2 +- images/alpine/openjdk8/jdk/Dockerfile | 4 ++-- images/alpine/openjdk8/jdk/README.md | 6 +++--- images/alpine/openjdk8/jdk/run-java.sh | 2 +- images/alpine/openjdk8/jre/Dockerfile | 4 ++-- images/alpine/openjdk8/jre/README.md | 6 +++--- images/alpine/openjdk8/jre/run-java.sh | 2 +- images/centos/openjdk11/jdk/Dockerfile | 6 +++--- images/centos/openjdk11/jdk/README.md | 4 ++-- images/centos/openjdk11/jdk/run-java.sh | 2 +- images/centos/openjdk11/jre/Dockerfile | 4 ++-- images/centos/openjdk11/jre/README.md | 4 ++-- images/centos/openjdk11/jre/run-java.sh | 2 +- images/centos/openjdk7/jdk/Dockerfile | 2 +- images/centos/openjdk7/jdk/README.md | 4 ++-- images/centos/openjdk7/jdk/run-java.sh | 2 +- images/centos/openjdk7/jre/Dockerfile | 2 +- images/centos/openjdk7/jre/README.md | 4 ++-- images/centos/openjdk7/jre/run-java.sh | 2 +- images/centos/openjdk8/jdk/Dockerfile | 6 +++--- images/centos/openjdk8/jdk/README.md | 4 ++-- images/centos/openjdk8/jdk/run-java.sh | 2 +- images/centos/openjdk8/jre/Dockerfile | 4 ++-- images/centos/openjdk8/jre/README.md | 4 ++-- images/centos/openjdk8/jre/run-java.sh | 2 +- images/jboss/openjdk7/jdk/README.md | 4 ++-- images/jboss/openjdk7/jdk/run-java.sh | 2 +- images/jboss/openjdk8/jdk/README.md | 4 ++-- images/jboss/openjdk8/jdk/run-java.sh | 2 +- images/ubi/openjdk11/jdk/Dockerfile | 4 ++-- images/ubi/openjdk11/jdk/README.md | 6 +++--- images/ubi/openjdk11/jdk/run-java.sh | 2 +- images/ubi/openjdk8/jdk/Dockerfile | 4 ++-- images/ubi/openjdk8/jdk/README.md | 6 +++--- images/ubi/openjdk8/jdk/run-java.sh | 2 +- 48 files changed, 96 insertions(+), 96 deletions(-) diff --git a/fish-pepper.yml b/fish-pepper.yml index 9e41a23..cf180b5 100644 --- 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 index 5d4c623..138f892 100644 --- 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 index 9529e2d..b2d54fc 100644 --- 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 index d084696..113e140 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index bab80fc..560207b 100644 --- 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 index e28c7b1..80e8cdf 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index dd0448d..a5f80c7 100644 --- 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 index 9b57f2b..8ca8f9f 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index c279d45..ad33f6a 100644 --- 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 index 549cbe4..ad49002 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index ce712c5..a697e41 100644 --- 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 index 0f0b09a..fa88d9e 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index ac46b4d..e592fa0 100644 --- 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 index ff7bb3b..0ce951f 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index 37fa8c5..678d20f 100644 --- 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 index 13d90d5..8ac47e2 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index 659012f..2ca6b12 100644 --- 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 index 447dfa6..ab5b7ae 100644 --- 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 index e5e2731..b6eac93 100644 --- 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 index f1e719f..76365a3 100644 --- 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 diff --git a/images/centos/openjdk7/jdk/README.md b/images/centos/openjdk7/jdk/README.md index 539ea8b..951e10c 100644 --- a/images/centos/openjdk7/jdk/README.md +++ b/images/centos/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: @@ -181,4 +181,4 @@ mvn clean install * Base-Image: **CentOS 7** * 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/centos/openjdk7/jdk/run-java.sh b/images/centos/openjdk7/jdk/run-java.sh index e5e2731..b6eac93 100644 --- a/images/centos/openjdk7/jdk/run-java.sh +++ b/images/centos/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/centos/openjdk7/jre/Dockerfile b/images/centos/openjdk7/jre/Dockerfile index 229bbf4..954465b 100644 --- a/images/centos/openjdk7/jre/Dockerfile +++ b/images/centos/openjdk7/jre/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:7.8.2003 +FROM centos:centos7.9.2009 USER root diff --git a/images/centos/openjdk7/jre/README.md b/images/centos/openjdk7/jre/README.md index ef2b9e3..12224ae 100644 --- a/images/centos/openjdk7/jre/README.md +++ b/images/centos/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: @@ -181,4 +181,4 @@ mvn clean install * Base-Image: **CentOS 7** * 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/centos/openjdk7/jre/run-java.sh b/images/centos/openjdk7/jre/run-java.sh index e5e2731..b6eac93 100644 --- a/images/centos/openjdk7/jre/run-java.sh +++ b/images/centos/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/centos/openjdk8/jdk/Dockerfile b/images/centos/openjdk8/jdk/Dockerfile index 273a846..674145f 100644 --- a/images/centos/openjdk8/jdk/Dockerfile +++ b/images/centos/openjdk8/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-1.8.0-openjdk-1.8.0.262.b10-0.el7_8 \ - java-1.8.0-openjdk-devel-1.8.0.262.b10-0.el7_8 \ + java-1.8.0-openjdk-1.8.0.312.b07-1.el7_9 \ + java-1.8.0-openjdk-devel-1.8.0.312.b07-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/openjdk8/jdk/README.md b/images/centos/openjdk8/jdk/README.md index 0fdfc42..cc7c689 100644 --- a/images/centos/openjdk8/jdk/README.md +++ b/images/centos/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: @@ -181,4 +181,4 @@ mvn clean install * Base-Image: **CentOS 7** * 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/centos/openjdk8/jdk/run-java.sh b/images/centos/openjdk8/jdk/run-java.sh index e5e2731..b6eac93 100644 --- a/images/centos/openjdk8/jdk/run-java.sh +++ b/images/centos/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/centos/openjdk8/jre/Dockerfile b/images/centos/openjdk8/jre/Dockerfile index 4b992c0..d45dccc 100644 --- a/images/centos/openjdk8/jre/Dockerfile +++ b/images/centos/openjdk8/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-1.8.0-openjdk-1.8.0.262.b10-0.el7_8 \ + java-1.8.0-openjdk-1.8.0.312.b07-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/openjdk8/jre/README.md b/images/centos/openjdk8/jre/README.md index ebc9239..b793283 100644 --- a/images/centos/openjdk8/jre/README.md +++ b/images/centos/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: @@ -181,4 +181,4 @@ mvn clean install * Base-Image: **CentOS 7** * 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/centos/openjdk8/jre/run-java.sh b/images/centos/openjdk8/jre/run-java.sh index e5e2731..b6eac93 100644 --- a/images/centos/openjdk8/jre/run-java.sh +++ b/images/centos/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/jboss/openjdk7/jdk/README.md b/images/jboss/openjdk7/jdk/README.md index 288af16..d44d777 100644 --- a/images/jboss/openjdk7/jdk/README.md +++ b/images/jboss/openjdk7/jdk/README.md @@ -27,7 +27,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: @@ -184,4 +184,4 @@ mvn clean install * Base-Image: **JBoss with OpenJDK undefined** * 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/jboss/openjdk7/jdk/run-java.sh b/images/jboss/openjdk7/jdk/run-java.sh index e5e2731..b6eac93 100644 --- a/images/jboss/openjdk7/jdk/run-java.sh +++ b/images/jboss/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/jboss/openjdk8/jdk/README.md b/images/jboss/openjdk8/jdk/README.md index 94fad31..ec9a09b 100644 --- a/images/jboss/openjdk8/jdk/README.md +++ b/images/jboss/openjdk8/jdk/README.md @@ -27,7 +27,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: @@ -184,4 +184,4 @@ mvn clean install * Base-Image: **JBoss with OpenJDK undefined** * 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/jboss/openjdk8/jdk/run-java.sh b/images/jboss/openjdk8/jdk/run-java.sh index e5e2731..b6eac93 100644 --- a/images/jboss/openjdk8/jdk/run-java.sh +++ b/images/jboss/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/ubi/openjdk11/jdk/Dockerfile b/images/ubi/openjdk11/jdk/Dockerfile index 87708ae..22b73c1 100644 --- a/images/ubi/openjdk11/jdk/Dockerfile +++ b/images/ubi/openjdk11/jdk/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.2-267 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-212 USER root @@ -11,7 +11,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 microdnf install java-11-openjdk-headless-11.0.7.10-1.el8_1 \ +RUN microdnf install java-11-openjdk-headless-11.0.13.0.8-1.el8_4 \ openssl curl ca-certificates \ && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \ && microdnf clean all diff --git a/images/ubi/openjdk11/jdk/README.md b/images/ubi/openjdk11/jdk/README.md index b54b4ec..26e7f28 100644 --- a/images/ubi/openjdk11/jdk/README.md +++ b/images/ubi/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: **UBI 8.1** +* Base-Image: **UBI 8.4** * 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/ubi/openjdk11/jdk/run-java.sh b/images/ubi/openjdk11/jdk/run-java.sh index e5e2731..b6eac93 100644 --- a/images/ubi/openjdk11/jdk/run-java.sh +++ b/images/ubi/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/ubi/openjdk8/jdk/Dockerfile b/images/ubi/openjdk8/jdk/Dockerfile index 869d800..c4a47f4 100644 --- a/images/ubi/openjdk8/jdk/Dockerfile +++ b/images/ubi/openjdk8/jdk/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.2-267 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-212 USER root @@ -11,7 +11,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 microdnf install java-1.8.0-openjdk-headless-1.8.0.252.b09-2.el8_1 \ +RUN microdnf install java-1.8.0-openjdk-headless-1.8.0.312.b07-1.el8_4 \ openssl curl ca-certificates \ && echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/jre/lib/security/java.security \ && microdnf clean all diff --git a/images/ubi/openjdk8/jdk/README.md b/images/ubi/openjdk8/jdk/README.md index 83be69a..6c0724d 100644 --- a/images/ubi/openjdk8/jdk/README.md +++ b/images/ubi/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: **UBI 8.1** +* Base-Image: **UBI 8.4** * 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/ubi/openjdk8/jdk/run-java.sh b/images/ubi/openjdk8/jdk/run-java.sh index e5e2731..b6eac93 100644 --- a/images/ubi/openjdk8/jdk/run-java.sh +++ b/images/ubi/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 }