From 5774089674d60a8ab4bb439d8894f7fb2c5d0cdc Mon Sep 17 00:00:00 2001 From: RayPlante Date: Wed, 21 Aug 2024 11:30:40 -0400 Subject: [PATCH] docker/build-test: fix Dockerfile cut-paste errro (causing attempt to install python2) --- docker/build-test/Dockerfile | 8 +------- docker/dockbuild.sh | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/docker/build-test/Dockerfile b/docker/build-test/Dockerfile index fba91c27..02539e9d 100644 --- a/docker/build-test/Dockerfile +++ b/docker/build-test/Dockerfile @@ -15,12 +15,6 @@ RUN java_certs=$JAVA_HOME/jre/lib/security/cacerts; \ keytool -import -keystore $java_certs -trustcacerts -file $crt \ -storepass changeit -alias $name -noprompt; \ done; -FROM eclipse-temurin:8 - -RUN mkdir -p /usr/share/man/man1 -RUN apt-get update && apt-get install -y netcat-openbsd zip git less \ - python2 curl maven -RUN cd /usr/bin && ln -s python2 python # Create the user that build/test operations should run as. Normally, # this is set to match identity information of the host user that is @@ -45,7 +39,7 @@ RUN chown $devuser:$devuser /home/$devuser/.m2/settings.xml && \ COPY entrypoint.sh /app/entrypoint.sh RUN chmod a+rx /app/entrypoint.sh -ENV S3MOCK_JAVA_OPTS -XX:+UseContainerSupport +ENV S3MOCK_JAVA_OPTS=-XX:+UseContainerSupport WORKDIR /app/dev USER $devuser diff --git a/docker/dockbuild.sh b/docker/dockbuild.sh index c38d8f0c..c380038c 100755 --- a/docker/dockbuild.sh +++ b/docker/dockbuild.sh @@ -12,7 +12,7 @@ set -e ## These are set by default via _run.sh; if necessary, uncomment and customize # -# PACKAGE_NAME=oar-build +PACKAGE_NAME=oar-dist-service # ## list the names of the image directories (each containing a Dockerfile) for ## containers to be built. List them in dependency order (where a latter one