Merge branch 'main' into multiple-images

diff --git a/.vscode/settings.json b/.vscode/settings.json
index eb3d18bbe9452ab8bcde30086aaa3631b92513c5..f8b126f14bd2a20ddf8cba4cfa5da420a6d3f1e1 100644 (file)
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,10 @@
 {
   "editor.codeActionsOnSave": {
     "source.fixAll": true
-  }
+  },
+  "cSpell.words": [
+    "ifeq",
+    "OPTARG",
+    "SAPMACHINE"
+  ]
 }

diff --git a/Makefile b/Makefile
index 3d0ffc86c4e154a620c2a40babb8847de5f30a83..d181f733dc43f60d726f6a4ecce9d391d9047973 100644 (file)
--- 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 (executable)
index 0000000..ce30de3
--- /dev/null
+++ b/build-image.sh
@@ -0,0 +1,42 @@
+#!/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"
+
+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 e27e772992d3772f699d16893a866f5009f80803..1798092b7fc564f7ddc952a1c1ff6f9b526b18f4 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,49 @@
 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.20.1
+        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.20.1
+        SAPMACHINE_VERSION: 17.0.4.1
+      dockerfile: Dockerfile