From ad7bbdf77324d16e2bf903e20784393b354f2c1d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 17 Apr 2024 17:20:26 +0200 Subject: [PATCH 1/6] fix: fix SAP JVM download MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8d5a31..7e1ff32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -154,7 +154,7 @@ RUN sapmachine_install() { \ apt-get update; \ 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; \ + curl -fsSLO --compressed -b 'eula_3_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt' https://tools.hana.ondemand.com/additional/sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \ 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; \ -- 2.34.1 From 7acb43b168a588e8860dec5ccd6b68e8b396d272 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 8 May 2024 14:46:45 +0200 Subject: [PATCH 2/6] chore: bump node 20.x.x to latest MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 77c222e..bddff99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.12.2 + NODE_VERSION: 20.13.0 SAPMACHINE_VERSION: 8.1.097 mbt-node18-java8-docker: platform: linux/amd64 @@ -37,7 +37,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.12.2 + NODE_VERSION: 20.13.0 SAPMACHINE_VERSION: 11.0.23 mbt-node18-java11-docker: platform: linux/amd64 @@ -69,7 +69,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.12.2 + NODE_VERSION: 20.13.0 SAPMACHINE_VERSION: 17.0.11 mbt-node18-java17-docker: platform: linux/amd64 @@ -101,7 +101,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.12.2 + NODE_VERSION: 20.13.0 SAPMACHINE_VERSION: 21.0.3 mbt-node18-java21-docker: platform: linux/amd64 -- 2.34.1 From 6ac6631c55e7a5e50b69b50110dd68339fb7b726 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 8 May 2024 15:03:40 +0200 Subject: [PATCH 3/6] chore: bump SAP JVM version to latest MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bddff99..1493abb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: dockerfile: Dockerfile args: NODE_VERSION: 20.13.0 - SAPMACHINE_VERSION: 8.1.097 + SAPMACHINE_VERSION: 8.1.098 mbt-node18-java8-docker: platform: linux/amd64 build: @@ -14,7 +14,7 @@ services: dockerfile: Dockerfile args: NODE_VERSION: 18.20.2 - SAPMACHINE_VERSION: 8.1.097 + SAPMACHINE_VERSION: 8.1.098 mbt-node16-java8-docker: platform: linux/amd64 build: @@ -22,7 +22,7 @@ services: dockerfile: Dockerfile args: NODE_VERSION: 16.20.2 - SAPMACHINE_VERSION: 8.1.097 + SAPMACHINE_VERSION: 8.1.098 mbt-node14-java8-docker: platform: linux/amd64 build: @@ -30,7 +30,7 @@ services: dockerfile: Dockerfile args: NODE_VERSION: 14.21.3 - SAPMACHINE_VERSION: 8.1.097 + SAPMACHINE_VERSION: 8.1.098 mbt-node20-java11-docker: platform: linux/amd64 build: -- 2.34.1 From b79a341940c68a70c699bd8300d24b3f02a6b0c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 8 May 2024 15:15:22 +0200 Subject: [PATCH 4/6] fix: update SAP JVM archive SHA1 hash MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7e1ff32..c34b434 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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_2_agreed=tools.hana.ondemand.com/developer-license-3_2.txt' https://tools.hana.ondemand.com/additional/sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip; \ - echo "cd82a1286f1853669a5bdac74a26807179feced9 sapjvm-${SAPMACHINE_VERSION}-linux-${ARCH}.zip" | sha1sum -c -; \ + echo "d93abcb60271b7240e828ba2551646c2825b0f9a 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; \ -- 2.34.1 From 2b579dd8db84bdbcc1ef73b816c3f7b4d5012360 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 8 May 2024 15:42:52 +0200 Subject: [PATCH 5/6] fix: add missing GPG pub key for node 20.x.x MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c34b434..17073b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,6 +54,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ A6023530FC53461FEC91F99C04CD3F2FDE079578 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \ -- 2.34.1 From 2b42927c5a54909329d7e78f67e453d81adfa70c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 10 May 2024 14:33:24 +0200 Subject: [PATCH 6/6] chore: bump node 20.x version to latest MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1493abb..256dd67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.13.0 + NODE_VERSION: 20.13.1 SAPMACHINE_VERSION: 8.1.098 mbt-node18-java8-docker: platform: linux/amd64 @@ -37,7 +37,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.13.0 + NODE_VERSION: 20.13.1 SAPMACHINE_VERSION: 11.0.23 mbt-node18-java11-docker: platform: linux/amd64 @@ -69,7 +69,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.13.0 + NODE_VERSION: 20.13.1 SAPMACHINE_VERSION: 17.0.11 mbt-node18-java17-docker: platform: linux/amd64 @@ -101,7 +101,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.13.0 + NODE_VERSION: 20.13.1 SAPMACHINE_VERSION: 21.0.3 mbt-node18-java21-docker: platform: linux/amd64 -- 2.34.1