From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Thu, 3 Nov 2022 14:39:46 +0000 (+0100)
Subject: Merge branch 'main' into multiple-images
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=9528c4510aff71b3f064946446af3282dc0ec3f7;hp=c52f471b4ee4245e17c41b4c7a7d28d4c6b2a1c0;p=mbt-docker.git

Merge branch 'main' into multiple-images

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

diff --git a/Dockerfile b/Dockerfile
index 4b04645..b475c25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -163,7 +163,12 @@ RUN set -ex \
   && rm -f apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
   && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
   && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
+<<<<<<< HEAD
+  && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
+  && apt-get remove --purge --autoremove -y ca-certificates curl \
+=======
   && apt-get remove --purge --autoremove -y ca-certificates curl gnupg dirmngr \
+>>>>>>> main
   # smoke test
   && mvn --version
 
diff --git a/Makefile b/Makefile
index 3d0ffc8..d181f73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PROJECT_NAME?=sap-e-mobility
-NAME?=mbt-docker
+NAME?=mbt-node16-java11-docker
 SUBMODULES_INIT?=false
 DOCKER_REGISTRY_USERNAME?=fraggle0
 DOCKER_REGISTRY_PASSWORD?=
diff --git a/build-image.sh b/build-image.sh
new file mode 100755
index 0000000..bb55f2f
--- /dev/null
+++ b/build-image.sh
@@ -0,0 +1,44 @@
+#!/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 \
+  mbt-node14-java19-docker mbt-node16-java19-docker mbt-node18-java19-docker"
+
+usage() {
+  echo "Usage: $0 [-n <${images// /|}|all>" 1>&2; exit 1;
+}
+
+all() {
+  for image in ${images}; do
+    make NAME=${image}
+  done
+}
+
+[ $# -eq 0 ] && usage
+while getopts "n:h" option; do
+  case "${option}" in
+    n)
+      name=${OPTARG}
+      if [[ ${name} == "all" ]]; then
+        all
+      elif [[ -z "${images##*$name*}" ]]; then
+        make NAME=${name}
+      else
+        echo "Error: Unknown image name for option argument -${OPTARG}" >&2;
+        usage
+      fi
+      ;;
+    \?)
+      # Invalid option
+      echo "Error: Unknown or invalid option argument for -${OPTARG}" >&2;
+      usage
+      ;;
+    :)
+      echo "Error: Missing option argument for -${OPTARG}" >&2;
+      usage
+      ;;
+    *|h)
+      usage
+      ;;
+  esac
+done
diff --git a/docker-compose.yml b/docker-compose.yml
index e27e772..eed0c37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,70 @@
 version: '3.8'
 services:
+  # TODO: remove once xmake is configured to push all images
   mbt-docker:
     platform: linux/amd64
     build:
       dockerfile: Dockerfile
+  mbt-node18-java11-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 18.12.0
+        SAPMACHINE_VERSION: 11.0.16.1
+      dockerfile: Dockerfile
+  mbt-node16-java11-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 16.18.0
+        SAPMACHINE_VERSION: 11.0.16.1
+      dockerfile: Dockerfile
+  mbt-node14-java11-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 14.21.0
+        SAPMACHINE_VERSION: 11.0.16.1
+      dockerfile: Dockerfile
+  mbt-node18-java17-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 18.12.0
+        SAPMACHINE_VERSION: 17.0.4.1
+      dockerfile: Dockerfile
+  mbt-node16-java17-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 16.18.0
+        SAPMACHINE_VERSION: 17.0.4.1
+      dockerfile: Dockerfile
+  mbt-node14-java17-docker:
+    platform: linux/amd64
+    build:
+      args:
+        NODE_VERSION: 14.21.0
+        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.21.0
+        SAPMACHINE_VERSION: 19.0.1
+      dockerfile: Dockerfile