From 69b53ef7fbf598bea60da2d6f6276efc2e3b25da Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Wed, 17 Apr 2024 16:30:13 +0200
Subject: [PATCH] build: apply updates
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
.vscode/settings.json | 2 +-
Dockerfile | 6 +++---
docker-compose.yml | 48 +++++++++++++++++++++----------------------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ece8485..4fb0b00 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
{
"editor.codeActionsOnSave": {
- "source.fixAll": true
+ "source.fixAll": "explicit"
},
"cSpell.words": [
"ifeq",
diff --git a/Dockerfile b/Dockerfile
index 65fa36e..a8d5a31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN set -ex \
ADD http://aia.pki.co.sap.com/aia/SAP%20Global%20Root%20CA.crt \
/etc/ssl/certs/SAP_Global_Root_CA.crt
-ARG NODE_VERSION=18.19.0
+ARG NODE_VERSION=18.20.2
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
@@ -113,7 +113,7 @@ RUN set -ex \
# smoke test
&& yarn --version
-ARG SAPMACHINE_VERSION=11.0.21
+ARG SAPMACHINE_VERSION=11.0.23
ENV JAVA_HOME /opt/jdk
@@ -155,7 +155,7 @@ RUN sapmachine_install() { \
apt-get install -y ca-certificates curl libarchive-tools --no-install-recommends; \
rm -rf /var/lib/apt/lists/*; \
curl -fsSLO --compressed -b 'eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt' https://tools.hana.ondemand.com/additional/sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \
- echo "ec0fcd79a658b465e0ea489b16f304265679e2ae sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \
+ echo "cd82a1286f1853669a5bdac74a26807179feced9 sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \
bsdtar -xvf sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip -C /usr/local --strip-components=1 --no-same-owner; \
rm -f sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \
apt-get remove --purge --auto-remove -y ca-certificates curl libarchive-tools; \
diff --git a/docker-compose.yml b/docker-compose.yml
index 91d0d51..b3a7546 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,16 +6,16 @@ services:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 20.10.0
- SAPMACHINE_VERSION: 8.1.096
+ NODE_VERSION: 20.12.2
+ SAPMACHINE_VERSION: 8.1.097
mbt-node18-java8-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 18.19.0
- SAPMACHINE_VERSION: 8.1.096
+ NODE_VERSION: 18.20.2
+ SAPMACHINE_VERSION: 8.1.097
mbt-node16-java8-docker:
platform: linux/amd64
build:
@@ -23,7 +23,7 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 16.20.2
- SAPMACHINE_VERSION: 8.1.096
+ SAPMACHINE_VERSION: 8.1.097
mbt-node14-java8-docker:
platform: linux/amd64
build:
@@ -31,23 +31,23 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 14.21.3
- SAPMACHINE_VERSION: 8.1.096
+ SAPMACHINE_VERSION: 8.1.097
mbt-node20-java11-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 20.10.0
- SAPMACHINE_VERSION: 11.0.21
+ NODE_VERSION: 20.12.2
+ SAPMACHINE_VERSION: 11.0.23
mbt-node18-java11-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 18.19.0
- SAPMACHINE_VERSION: 11.0.21
+ NODE_VERSION: 18.20.2
+ SAPMACHINE_VERSION: 11.0.23
mbt-node16-java11-docker:
platform: linux/amd64
build:
@@ -55,7 +55,7 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 16.20.2
- SAPMACHINE_VERSION: 11.0.21
+ SAPMACHINE_VERSION: 11.0.23
mbt-node14-java11-docker:
platform: linux/amd64
build:
@@ -63,23 +63,23 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 14.21.3
- SAPMACHINE_VERSION: 11.0.21
+ SAPMACHINE_VERSION: 11.0.23
mbt-node20-java17-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 20.10.0
- SAPMACHINE_VERSION: 17.0.9
+ NODE_VERSION: 20.12.2
+ SAPMACHINE_VERSION: 17.0.11
mbt-node18-java17-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 18.19.0
- SAPMACHINE_VERSION: 17.0.9
+ NODE_VERSION: 18.20.2
+ SAPMACHINE_VERSION: 17.0.11
mbt-node16-java17-docker:
platform: linux/amd64
build:
@@ -87,7 +87,7 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 16.20.2
- SAPMACHINE_VERSION: 17.0.9
+ SAPMACHINE_VERSION: 17.0.11
mbt-node14-java17-docker:
platform: linux/amd64
build:
@@ -95,23 +95,23 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 14.21.3
- SAPMACHINE_VERSION: 17.0.9
+ SAPMACHINE_VERSION: 17.0.11
mbt-node20-java21-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 20.10.0
- SAPMACHINE_VERSION: 21.0.1
+ NODE_VERSION: 20.12.2
+ SAPMACHINE_VERSION: 21.0.3
mbt-node18-java21-docker:
platform: linux/amd64
build:
context: .
dockerfile: Dockerfile
args:
- NODE_VERSION: 18.19.0
- SAPMACHINE_VERSION: 21.0.1
+ NODE_VERSION: 18.20.2
+ SAPMACHINE_VERSION: 21.0.3
mbt-node16-java21-docker:
platform: linux/amd64
build:
@@ -119,7 +119,7 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 16.20.2
- SAPMACHINE_VERSION: 21.0.1
+ SAPMACHINE_VERSION: 21.0.3
mbt-node14-java21-docker:
platform: linux/amd64
build:
@@ -127,4 +127,4 @@ services:
dockerfile: Dockerfile
args:
NODE_VERSION: 14.21.3
- SAPMACHINE_VERSION: 21.0.1
+ SAPMACHINE_VERSION: 21.0.3
--
2.43.0