From 9360cf25808102e5b6de0f18f6d0fb18f46c4710 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 28 Oct 2022 22:18:31 +0200 Subject: [PATCH] Add current node LTS version to the images list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .vscode/settings.json | 7 ++++++- build-image.sh | 2 +- docker-compose.yml | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index eb3d18b..f8b126f 100644 --- 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/build-image.sh b/build-image.sh index 1ffbf30..ce30de3 100755 --- a/build-image.sh +++ b/build-image.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -images="mbt-node14-java11-docker mbt-node16-java11-docker mbt-node14-java17-docker mbt-node16-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" usage() { echo "Usage: $0 [-n <${images// /|}|all>" 1>&2; exit 1; diff --git a/docker-compose.yml b/docker-compose.yml index 62f8405..1798092 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,13 @@ services: 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: @@ -19,6 +26,13 @@ services: 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: -- 2.34.1