Merge branch 'main' into multiple-images

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --combined Dockerfile
index e8277c73f2df024947c1c28c92d02fe79e454f81,4b046454d5adf6d6cedfe9947316bcdad5b9d392..b475c250dc45a5a3ce893583ec98699beea13498
--- 1/Dockerfile
--- 2/Dockerfile
+++ b/Dockerfile
@@@ -38,7 -38,7 +38,7 @@@ RUN ARCH= && dpkgArch="$(dpkg --print-a
      && set -ex \
      && apt-get update \
      # libatomic1 for arm
-     && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
+     && apt-get install -y ca-certificates curl gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
      && rm -rf /var/lib/apt/lists/* \
      && for key in \
        4ED778F539E3634C779C87C6D7062848A1AB005C \
@@@ -57,7 -57,7 +57,7 @@@
        B9E2F5981AA6E0CD28160D9FF13993A75599653C \
      ; do \
        gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
-       gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
+       gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
      done \
      && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
      && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@@ -84,13 -84,13 +84,13 @@@ ARG YARN_VERSION=1.22.1
  RUN set -ex \
    && savedAptMark="$(apt-mark showmanual)" \
    && apt-get update \
-   && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \
+   && apt-get install -y ca-certificates curl gnupg dirmngr --no-install-recommends \
    && rm -rf /var/lib/apt/lists/* \
    && for key in \
      6A010C5166006599AA17F08146C2130DFD2497F5 \
    ; do \
      gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
-     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
+     gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
    done \
    && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
    && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
@@@ -122,40 -122,52 +122,57 @@@ RUN ARCH= && dpkgArch="$(dpkg --print-a
      esac \
    && set -ex \
    && apt-get update \
-   && apt-get install -y ca-certificates wget --no-install-recommends \
+   && apt-get install -y ca-certificates gnupg dirmngr --no-install-recommends \
    && rm -rf /var/lib/apt/lists/* \
-   && wget -q -O - https://dist.sapmachine.io/debian/sapmachine.key | tee /etc/apt/trusted.gpg.d/sapmachine.gpg.asc \
+   && for key in \
+     62754C3B3ABCFE23 \
+   ; do \
+     gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
+     gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/sapmachine.gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
+   done \
+   && chmod 644 /etc/apt/trusted.gpg.d/sapmachine.gpg \
    && echo "deb http://dist.sapmachine.io/debian/${ARCH}/ ./" | tee /etc/apt/sources.list.d/sapmachine.list \
    && apt-get update \
    && apt-get install -y sapmachine-$(echo ${SAPMACHINE_VERSION} | cut -d. -f1)-jdk=${SAPMACHINE_VERSION} --no-install-recommends \
    && rm -rf /var/lib/apt/lists/* \
-   && apt-get remove --purge --autoremove -y ca-certificates wget \
+   && apt-get remove --purge --autoremove -y ca-certificates gnupg dirmngr \
    # smoke test
    && java --version
  
  ARG MAVEN_VERSION=3.8.6
- ARG SHA=f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
- ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries
  
  ENV MAVEN_HOME /usr/share/maven
  ENV M2_HOME ${MAVEN_HOME}
  
  RUN set -ex \
    && apt-get update \
-   && apt-get install -y ca-certificates curl procps --no-install-recommends \
+   && apt-get install -y ca-certificates curl gnupg dirmngr --no-install-recommends \
    && rm -rf /var/lib/apt/lists/* \
+   && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+   && curl -fsSLO --compressed ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc \
+   && for key in \
+     6A814B1F869C2BBEAB7CB7271A2A1C94BDE89688 \
+   ; do \
+     gpg --batch --keyserver hkps://pgp.surf.nl --recv-keys "$key" || \
+     gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
+   done \
+   && gpg --batch --verify apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
    && mkdir -p ${MAVEN_HOME} ${MAVEN_HOME}/ref \
-   && curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
-   && echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
-   && tar -xzf /tmp/apache-maven.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
-   && rm -f /tmp/apache-maven.tar.gz \
+   && tar -xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz -C ${MAVEN_HOME} --strip-components=1 \
+   && rm -f apache-maven-${MAVEN_VERSION}-bin.tar.gz.asc apache-maven-${MAVEN_VERSION}-bin.tar.gz \
+   && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
    && ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn \
++<<<<<<< HEAD
 +  && chmod --recursive a+w ${MAVEN_HOME}/conf/* \
 +  && apt-get remove --purge --autoremove -y ca-certificates curl \
++=======
+   && apt-get remove --purge --autoremove -y ca-certificates curl gnupg dirmngr \
++>>>>>>> main
    # smoke test
    && mvn --version
  
- ARG MBT_VERSION=1.2.18
+ ARG MBT_VERSION=1.2.19
  
  RUN set -ex \
    && npm install -g --unsafe-perm mbt@${MBT_VERSION} \

diff --combined docker-compose.yml
index 58e138e54b577c7554b2e36c9903ded0b7c5f415,e27e772992d3772f699d16893a866f5009f80803..eed0c37d2bf304e8a1279b9644973b3955da43d8
--- 1/docker-compose.yml
--- 2/docker-compose.yml
+++ b/docker-compose.yml
@@@ -1,70 -1,6 +1,70 @@@
  version: '3.8'
  services:
 +  # TODO: remove once xmake is configured to push all images
    mbt-docker:
      platform: linux/amd64
      build:
        dockerfile: Dockerfile
-         NODE_VERSION: 14.20.1
 +  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
++        NODE_VERSION: 14.21.0
 +        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
++        NODE_VERSION: 14.21.0
 +        SAPMACHINE_VERSION: 17.0.4.1
 +      dockerfile: Dockerfile
 +  mbt-node18-java19-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 18.12.0
 +        SAPMACHINE_VERSION: 19.0.1
 +      dockerfile: Dockerfile
 +  mbt-node16-java19-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
 +        NODE_VERSION: 16.18.0
 +        SAPMACHINE_VERSION: 19.0.1
 +      dockerfile: Dockerfile
 +  mbt-node14-java19-docker:
 +    platform: linux/amd64
 +    build:
 +      args:
++        NODE_VERSION: 14.21.0
 +        SAPMACHINE_VERSION: 19.0.1
 +      dockerfile: Dockerfile