From: Jérôme Benoit Date: Fri, 20 Oct 2023 21:19:59 +0000 (+0200) Subject: Bump versions X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=3f261b9afbae8809ff0bb5bab9ee2a160c065d54;hp=60a50d5d483361ea602e339c66eaca691f3c75e7;p=mbt-docker.git Bump versions Signed-off-by: Jérôme Benoit --- diff --git a/Dockerfile b/Dockerfile index 71fa870..b914ffd 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=16.20.2 +ARG NODE_VERSION=18.18.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.20.1 +ARG SAPMACHINE_VERSION=11.0.21 ENV JAVA_HOME /opt/jdk @@ -170,7 +170,7 @@ RUN sapmachine_install() { \ # smoke test && java -version -ARG MAVEN_VERSION=3.9.4 +ARG MAVEN_VERSION=3.9.5 ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries ENV MAVEN_HOME /usr/share/maven @@ -199,7 +199,7 @@ RUN set -ex \ # smoke test && mvn --version -ARG MBT_VERSION=1.2.25 +ARG MBT_VERSION=1.2.26 RUN set -ex \ && npm install -g --unsafe-perm mbt@${MBT_VERSION} \ diff --git a/docker-compose.yml b/docker-compose.yml index 738593f..cd706c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.8.0 + NODE_VERSION: 20.8.1 SAPMACHINE_VERSION: 8.1.095 mbt-node18-java8-docker: platform: linux/amd64 @@ -14,7 +14,7 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 18.18.0 + NODE_VERSION: 18.18.2 SAPMACHINE_VERSION: 8.1.095 mbt-node16-java8-docker: platform: linux/amd64 @@ -38,16 +38,16 @@ services: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.8.0 - SAPMACHINE_VERSION: 11.0.20.1 + NODE_VERSION: 20.8.1 + SAPMACHINE_VERSION: 11.0.21 mbt-node18-java11-docker: platform: linux/amd64 build: context: . dockerfile: Dockerfile args: - NODE_VERSION: 18.18.0 - SAPMACHINE_VERSION: 11.0.20.1 + NODE_VERSION: 18.18.2 + SAPMACHINE_VERSION: 11.0.21 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.20.1 + SAPMACHINE_VERSION: 11.0.21 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.20.1 + SAPMACHINE_VERSION: 11.0.21 mbt-node20-java17-docker: platform: linux/amd64 build: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.8.0 - SAPMACHINE_VERSION: 17.0.8.1 + NODE_VERSION: 20.8.1 + SAPMACHINE_VERSION: 17.0.9 mbt-node18-java17-docker: platform: linux/amd64 build: context: . dockerfile: Dockerfile args: - NODE_VERSION: 18.18.0 - SAPMACHINE_VERSION: 17.0.8.1 + NODE_VERSION: 18.18.2 + SAPMACHINE_VERSION: 17.0.9 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.8.1 + SAPMACHINE_VERSION: 17.0.9 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.8.1 + SAPMACHINE_VERSION: 17.0.9 mbt-node20-java21-docker: platform: linux/amd64 build: context: . dockerfile: Dockerfile args: - NODE_VERSION: 20.8.0 - SAPMACHINE_VERSION: 21 + NODE_VERSION: 20.8.1 + SAPMACHINE_VERSION: 21.0.1 mbt-node18-java21-docker: platform: linux/amd64 build: context: . dockerfile: Dockerfile args: - NODE_VERSION: 18.18.0 - SAPMACHINE_VERSION: 21 + NODE_VERSION: 18.18.2 + SAPMACHINE_VERSION: 21.0.1 mbt-node16-java21-docker: platform: linux/amd64 build: @@ -119,7 +119,7 @@ services: dockerfile: Dockerfile args: NODE_VERSION: 16.20.2 - SAPMACHINE_VERSION: 21 + SAPMACHINE_VERSION: 21.0.1 mbt-node14-java21-docker: platform: linux/amd64 build: @@ -127,4 +127,4 @@ services: dockerfile: Dockerfile args: NODE_VERSION: 14.21.3 - SAPMACHINE_VERSION: 21 + SAPMACHINE_VERSION: 21.0.1