Skip to content

Commit

Permalink
fix?
Browse files Browse the repository at this point in the history
  • Loading branch information
fhoeben committed Jul 12, 2024
1 parent e9bd29c commit b6bce81
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG BASE_WORKDIR
RUN mkdir -p ${BASE_WORKDIR}
WORKDIR ${BASE_WORKDIR}

COPY --link pom.xml .
COPY --link pom.xml ./

RUN mvn compile -Dhsac.fixtures.version=${VERSION}

Expand All @@ -28,8 +28,6 @@ FROM ${JRE_IMAGE} AS hsac-fixtures
ARG BASE_WORKDIR

RUN mkdir -p /fitnesse/wiki/fixtures/nl/hsac/fitnesse
RUN ls -la /fitnesse/


WORKDIR /fitnesse

Expand All @@ -40,9 +38,9 @@ RUN mkdir wiki/FitNesseRoot
VOLUME /fitnesse/wiki/FitNesseRoot

ENV FITNESSE_OPTS -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true
COPY --link test/runTests.sh .
COPY --link test/rerunFailedTests.sh .
COPY --link test/htmlReportIndexGenerator.sh .
COPY --link test/runTests.sh ./
COPY --link test/rerunFailedTests.sh ./
COPY --link test/htmlReportIndexGenerator.sh ./

RUN ls -la /fitnesse/

Expand Down Expand Up @@ -71,7 +69,7 @@ RUN sudo mv /etc/supervisor/conf.d/selenium.conf /etc/supervisor/conf.d/selenium
sudo chown -R 1200:1201 /fitnesse/

WORKDIR /fitnesse
COPY --link chrome/startGridAndRunTests.sh .
COPY --link chrome/startGridAndRunTests.sh ./
COPY --link chrome/fitnesse-hsac.conf /etc/supervisor/conf.d/

VOLUME /fitnesse/target
Expand Down Expand Up @@ -110,4 +108,4 @@ VOLUME /fitnesse/target
ENTRYPOINT ["/fitnesse/hsac-html-report-generator"]
CMD []

COPY --link --from=graal-fitnesse /fitnesse/hsac-html-report-generator .
COPY --link --from=graal-fitnesse /fitnesse/hsac-html-report-generator ./

0 comments on commit b6bce81

Please sign in to comment.