Skip to content

Commit

Permalink
docker/build-test: fix Dockerfile cut-paste errro (causing attempt to…
Browse files Browse the repository at this point in the history
… install python2)
  • Loading branch information
RayPlante committed Aug 21, 2024
1 parent 38d2f58 commit 5774089
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
8 changes: 1 addition & 7 deletions docker/build-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/dockbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5774089

Please sign in to comment.