From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Sat, 29 Oct 2022 09:36:51 +0000 (+0200)
Subject: Add SAP Machine 19 images
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=81986a8d2bf945d84bb3258b96d6310c05fc5c3f;p=mbt-docker.git

Add SAP Machine 19 images

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

diff --git a/Dockerfile b/Dockerfile
index fd92977..e8277c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,8 @@ RUN set -ex \
   && apt-get update \
   && apt-get install -y openssl --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
+   # smoke test
+  && openssl version \
   && useradd --home-dir ${USER_HOME_DIR} \
             --create-home \
             --shell /bin/bash \
@@ -148,7 +150,7 @@ RUN set -ex \
   && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
-  && chmod --recursive a+w "${MAVEN_HOME}"/conf/* \
+  && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
   && apt-get remove --purge --autoremove -y ca-certificates curl \
   # smoke test
   && mvn --version
diff --git a/build-image.sh b/build-image.sh
index ce30de3..bb55f2f 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env sh
 
-images="mbt-node14-java11-docker mbt-node16-java11-docker mbt-node18-java11-docker mbt-node14-java17-docker mbt-node16-java17-docker mbt-node18-java17-docker"
+images="mbt-node14-java11-docker mbt-node16-java11-docker mbt-node18-java11-docker \
+  mbt-node14-java17-docker mbt-node16-java17-docker mbt-node18-java17-docker \
+  mbt-node14-java19-docker mbt-node16-java19-docker mbt-node18-java19-docker"
 
 usage() {
   echo "Usage: $0 [-n <${images// /|}|all>" 1>&2; exit 1;
diff --git a/docker-compose.yml b/docker-compose.yml
index 1798092..58e138e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,3 +47,24 @@ services:
         NODE_VERSION: 14.20.1
         SAPMACHINE_VERSION: 17.0.4.1
       dockerfile: Dockerfile
+  mbt-node18-java19-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 18.12.0
+        SAPMACHINE_VERSION: 19.0.1
+      dockerfile: Dockerfile
+  mbt-node16-java19-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 16.18.0
+        SAPMACHINE_VERSION: 19.0.1
+      dockerfile: Dockerfile
+  mbt-node14-java19-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 14.20.1
+        SAPMACHINE_VERSION: 19.0.1
+      dockerfile: Dockerfile