From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Wed, 2 Aug 2023 13:53:36 +0000 (+0200)
Subject: Merge branch 'main' of git.piment-noir.org:mbt-docker
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=46768a518ab66563b47491a177d1ea2c3280d4a3;hp=-c;p=mbt-docker.git

Merge branch 'main' of git.piment-noir.org:mbt-docker

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

46768a518ab66563b47491a177d1ea2c3280d4a3
diff --combined Dockerfile
index 7bcd080,9ca24f4..b626894
--- a/Dockerfile
+++ b/Dockerfile
@@@ -52,6 -52,7 +52,7 @@@ RUN ARCH= && dpkgArch="$(dpkg --print-a
        890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
        C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
        108F52B48DB57BB0CC439B2997B01419BD92F80A \
+       DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
      ; do \
        gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
        gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" ; \
@@@ -111,7 -112,7 +112,7 @@@ RUN set -ex 
    # smoke test
    && yarn --version
  
 -ARG SAPMACHINE_VERSION=11.0.19
 +ARG SAPMACHINE_VERSION=11.0.20
  
  ENV JAVA_HOME /opt/jdk
  
@@@ -197,7 -198,7 +198,7 @@@ RUN set -ex 
    # smoke test
    && mvn --version
  
 -ARG MBT_VERSION=1.2.23
 +ARG MBT_VERSION=1.2.24
  
  RUN set -ex \
    && npm install -g --unsafe-perm mbt@${MBT_VERSION} \