Merge branch 'main' of git.piment-noir.org:mbt-docker

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/Dockerfile b/Dockerfile
index 9ca24f4a7b036b89903dffda711d95c11db7daaa..b626894a1a922adc6a866d1066e368568ea4fe9a 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,7 +112,7 @@ RUN set -ex \
   # smoke test
   && yarn --version
 
-ARG SAPMACHINE_VERSION=11.0.19
+ARG SAPMACHINE_VERSION=11.0.20
 
 ENV JAVA_HOME /opt/jdk
 
@@ -198,7 +198,7 @@ RUN set -ex \
   # smoke test
   && mvn --version
 
-ARG MBT_VERSION=1.2.23
+ARG MBT_VERSION=1.2.24
 
 RUN set -ex \
   && npm install -g --unsafe-perm mbt@${MBT_VERSION} \

diff --git a/docker-compose.yml b/docker-compose.yml
index 061d701144fc26d7893a4919158d78f7ab16e8fb..f1f4f751c3c86ebae49bc2554cb10d3777db111a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,7 +39,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 20.5.0
-        SAPMACHINE_VERSION: 11.0.19
+        SAPMACHINE_VERSION: 11.0.20
   mbt-node18-java11-docker:
     platform: linux/amd64
     build:
@@ -47,7 +47,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 18.17.0
-        SAPMACHINE_VERSION: 11.0.19
+        SAPMACHINE_VERSION: 11.0.20
   mbt-node16-java11-docker:
     platform: linux/amd64
     build:
@@ -55,7 +55,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 16.20.1
-        SAPMACHINE_VERSION: 11.0.19
+        SAPMACHINE_VERSION: 11.0.20
   mbt-node14-java11-docker:
     platform: linux/amd64
     build:
@@ -63,7 +63,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 14.21.3
-        SAPMACHINE_VERSION: 11.0.19
+        SAPMACHINE_VERSION: 11.0.20
   mbt-node20-java17-docker:
     platform: linux/amd64
     build:
@@ -71,7 +71,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 20.5.0
-        SAPMACHINE_VERSION: 17.0.7
+        SAPMACHINE_VERSION: 17.0.8
   mbt-node18-java17-docker:
     platform: linux/amd64
     build:
@@ -79,7 +79,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 18.17.0
-        SAPMACHINE_VERSION: 17.0.7
+        SAPMACHINE_VERSION: 17.0.8
   mbt-node16-java17-docker:
     platform: linux/amd64
     build:
@@ -87,7 +87,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 16.20.1
-        SAPMACHINE_VERSION: 17.0.7
+        SAPMACHINE_VERSION: 17.0.8
   mbt-node14-java17-docker:
     platform: linux/amd64
     build:
@@ -95,7 +95,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 14.21.3
-        SAPMACHINE_VERSION: 17.0.7
+        SAPMACHINE_VERSION: 17.0.8
   mbt-node20-java20-docker:
     platform: linux/amd64
     build:
@@ -103,7 +103,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 20.5.0
-        SAPMACHINE_VERSION: 20.0.1
+        SAPMACHINE_VERSION: 20.0.2
   mbt-node18-java20-docker:
     platform: linux/amd64
     build:
@@ -111,7 +111,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 18.17.0
-        SAPMACHINE_VERSION: 20.0.1
+        SAPMACHINE_VERSION: 20.0.2
   mbt-node16-java20-docker:
     platform: linux/amd64
     build:
@@ -119,7 +119,7 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 16.20.1
-        SAPMACHINE_VERSION: 20.0.1
+        SAPMACHINE_VERSION: 20.0.2
   mbt-node14-java20-docker:
     platform: linux/amd64
     build:
@@ -127,4 +127,4 @@ services:
       dockerfile: Dockerfile
       args:
         NODE_VERSION: 14.21.3
-        SAPMACHINE_VERSION: 20.0.1
+        SAPMACHINE_VERSION: 20.0.2