Merge pull request #14 from smatvienko-tb/java-update

Java update
thingsboard · Apr 25, 2024 · a4910af · a4910af
2 parents 61a8b85 + 79ea780
commit a4910af
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git 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/base/pom.xml b/base/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <artifactId>docker</artifactId>
     </parent>
     <artifactId>base</artifactId>

diff --git 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">
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <artifactId>docker</artifactId>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/node/pom.xml b/node/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <artifactId>docker</artifactId>
     </parent>
     <artifactId>node</artifactId>

diff --git 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/openjdk11/pom.xml b/openjdk11/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <artifactId>docker</artifactId>
     </parent>
     <artifactId>openjdk11</artifactId>
@@ -37,7 +37,6 @@
         <docker.push-arm-amd-image.phase>pre-integration-test</docker.push-arm-amd-image.phase>
         <docker.push-arm-amd-image-debian-codename.phase>pre-integration-test</docker.push-arm-amd-image-debian-codename.phase>
     </properties>
-
     <build>
         <plugins>
             <plugin>

diff --git 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/openjdk17/pom.xml b/openjdk17/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <artifactId>docker</artifactId>
     </parent>
     <artifactId>openjdk17</artifactId>

diff --git 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)" ]; \

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>docker</artifactId>
-    <version>1.8.0</version>
+    <version>1.9.0</version>
     <packaging>pom</packaging>
 
     <name>ThingsBoard Base Docker images</name>

diff --git a/toolbox/pom.xml b/toolbox/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.thingsboard</groupId>
         <artifactId>docker</artifactId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
     </parent>
 
     <artifactId>toolbox</artifactId>

diff --git a/website/pom.xml b/website/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.8.0</version>
+        <version>1.9.0</version>
         <artifactId>docker</artifactId>
     </parent>
     <artifactId>website</artifactId>