From 786c5d831e099caec3b2ed82ed259b6906211cd5 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Thu, 25 Apr 2024 14:32:29 +0200 Subject: [PATCH 1/2] Java 11, Java 17 latest --- README.md | 5 ++++- openjdk11/docker/Dockerfile | 6 +++--- openjdk17/docker/Dockerfile | 6 +++--- openjdk21/docker/Dockerfile | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4de0b1f..fa479a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,10 @@ Build multi-arch images and push to Docker Hub: ```bash -mvn clean install -P push-docker-amd-arm-images +docker buildx prune +mvn clean install -P push-docker-amd-arm-images -pl base -Ddebian.codename=bullseye-slim +mvn clean install -P push-docker-amd-arm-images -pl base +mvn clean install -P push-docker-amd-arm-images -pl '!base,!openjdk21' ``` Build specific node version: diff --git a/openjdk11/docker/Dockerfile b/openjdk11/docker/Dockerfile index edb1ea8..3a8a426 100644 --- a/openjdk11/docker/Dockerfile +++ b/openjdk11/docker/Dockerfile @@ -20,8 +20,8 @@ FROM thingsboard/base:${debian.codename} # Default to UTF-8 file.encoding ENV LANG C.UTF-8 ENV JAVA_HOME /docker-java-home -ENV JAVA_VERSION 11.0.22 -ENV JAVA_DEBIAN_VERSION 11.0.22+7-1~deb11u1 +ENV JAVA_VERSION 11.0.23 +ENV JAVA_DEBIAN_VERSION 11.0.23+9-1~deb11u1 RUN apt-get update && apt-get install -y --no-install-recommends \ apt-transport-https \ @@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ apt-get autoremove --purge --yes ; \ rm -rf /var/lib/apt/lists/*; \ # expire resolved DNS in 60 sec - echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security \ + echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security ; \ \ # verify that "docker-java-home" returns what we expect [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ diff --git a/openjdk17/docker/Dockerfile b/openjdk17/docker/Dockerfile index 3975111..dd2c2ac 100644 --- a/openjdk17/docker/Dockerfile +++ b/openjdk17/docker/Dockerfile @@ -19,8 +19,8 @@ FROM ${docker.repo}/base:${debian.codename} # Default to UTF-8 file.encoding ENV LANG C.UTF-8 ENV JAVA_HOME /docker-java-home -ENV JAVA_VERSION 17.0.10 -ENV JAVA_DEBIAN_VERSION 17.0.10+7-1~deb12u1 +ENV JAVA_VERSION 17.0.11 +ENV JAVA_DEBIAN_VERSION 17.0.11+9-1~deb12u1 RUN apt-get update && apt-get install -y --no-install-recommends \ apt-transport-https \ @@ -43,7 +43,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ apt-get autoremove --purge --yes ; \ rm -rf /var/lib/apt/lists/*; \ # expire resolved DNS in 60 sec - echo 'networkaddress.cache.ttl=60' >> /etc/java-17-openjdk/security/java.security \ + echo 'networkaddress.cache.ttl=60' >> /etc/java-17-openjdk/security/java.security ; \ \ # verify that "docker-java-home" returns what we expect [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ diff --git a/openjdk21/docker/Dockerfile b/openjdk21/docker/Dockerfile index b9fb3dd..fc22465 100644 --- a/openjdk21/docker/Dockerfile +++ b/openjdk21/docker/Dockerfile @@ -46,7 +46,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ apt-get autoremove --purge --yes ; \ rm -rf /var/lib/apt/lists/*; \ # expire resolved DNS in 60 sec - echo 'networkaddress.cache.ttl=60' >> /etc/java-21-openjdk/security/java.security \ + echo 'networkaddress.cache.ttl=60' >> /etc/java-21-openjdk/security/java.security ; \ \ # verify that "docker-java-home" returns what we expect [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ From 79ea7800afd419d16f7cd896280de4ee9abfb60a Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Thu, 25 Apr 2024 14:43:35 +0200 Subject: [PATCH 2/2] version 1.9.0 --- base/pom.xml | 2 +- haproxy-certbot/pom.xml | 2 +- node/pom.xml | 2 +- openjdk11/pom.xml | 3 +-- openjdk17/pom.xml | 2 +- pom.xml | 2 +- toolbox/pom.xml | 2 +- website/pom.xml | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/base/pom.xml b/base/pom.xml index 6025f5d..363b821 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.8.0 + 1.9.0 docker base diff --git a/haproxy-certbot/pom.xml b/haproxy-certbot/pom.xml index 3df66d9..843aaa6 100644 --- a/haproxy-certbot/pom.xml +++ b/haproxy-certbot/pom.xml @@ -21,7 +21,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.thingsboard - 1.8.0 + 1.9.0 docker 4.0.0 diff --git a/node/pom.xml b/node/pom.xml index d1ce4cc..b2a92b4 100644 --- a/node/pom.xml +++ b/node/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.8.0 + 1.9.0 docker node diff --git a/openjdk11/pom.xml b/openjdk11/pom.xml index 47f3833..853523d 100644 --- a/openjdk11/pom.xml +++ b/openjdk11/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.8.0 + 1.9.0 docker openjdk11 @@ -37,7 +37,6 @@ pre-integration-test pre-integration-test - diff --git a/openjdk17/pom.xml b/openjdk17/pom.xml index 1ea3ecb..13fd1ba 100644 --- a/openjdk17/pom.xml +++ b/openjdk17/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.8.0 + 1.9.0 docker openjdk17 diff --git a/pom.xml b/pom.xml index ad23097..edd393a 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard docker - 1.8.0 + 1.9.0 pom ThingsBoard Base Docker images diff --git a/toolbox/pom.xml b/toolbox/pom.xml index 81266f9..7b64ad2 100644 --- a/toolbox/pom.xml +++ b/toolbox/pom.xml @@ -22,7 +22,7 @@ org.thingsboard docker - 1.8.0 + 1.9.0 toolbox diff --git a/website/pom.xml b/website/pom.xml index e85ee09..0e46355 100644 --- a/website/pom.xml +++ b/website/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 1.8.0 + 1.9.0 docker website