X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=Dockerfile;h=b475c250dc45a5a3ce893583ec98699beea13498;hb=9528c4510aff71b3f064946446af3282dc0ec3f7;hp=4b046454d5adf6d6cedfe9947316bcdad5b9d392;hpb=c52f471b4ee4245e17c41b4c7a7d28d4c6b2a1c0;p=mbt-docker.git

diff --git a/Dockerfile b/Dockerfile
index 4b04645..b475c25 100644
--- 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