Merge branch 'main' into multiple-images

[mbt-docker.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 4b046454d5adf6d6cedfe9947316bcdad5b9d392..b475c250dc45a5a3ce893583ec98699beea13498 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -163,7 +163,12 @@ RUN set -ex \
   && 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