Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
Skip git-commit-id maven plugin
Browse files Browse the repository at this point in the history
This avoids the need for the makefile and is based on a suggestion by @mamoit
  • Loading branch information
jopereira committed Oct 27, 2020
1 parent a12862c commit c71bbd6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
9 changes: 1 addition & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@

images:
rm -rf backendws/dp3t-sdk-backend-build && \
git clone backendws/dp3t-sdk-backend backendws/dp3t-sdk-backend-build && \
(cd backendws/dp3t-sdk-backend; git diff)|(cd backendws/dp3t-sdk-backend-build; patch -p1)
rm -rf authcodews/CovidCode-Service-build && \
git clone authcodews/CovidCode-Service authcodews/CovidCode-Service-build && \
(cd authcodews/CovidCode-Service; git diff)|(cd authcodews/CovidCode-Service-build; patch -p1)
docker-compose build
rm -rf backendws/dp3t-sdk-backend-build authcodews/CovidCode-Service-build
echo "The makefile is no longer needed. Use 'docker-compose build'"
3 changes: 2 additions & 1 deletion authcodews/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ FROM openjdk:11 AS build

RUN apt-get update && apt-get install -y maven
WORKDIR /build/
COPY CovidCode-Service-build /build
COPY CovidCode-Service /build
RUN sed -i '/.*injectAllReactorProjects.*/i <skip>true</skip>' /build/pom.xml
RUN mvn package -Dmaven.test.skip=true

FROM openjdk:11.0.7-jre-slim
Expand Down
7 changes: 4 additions & 3 deletions backendws/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ FROM openjdk:11 AS build

RUN apt-get update && apt-get install -y maven
WORKDIR /build/
COPY dp3t-sdk-backend-build /build/dp3t-sdk-backend/
RUN mvn -f dp3t-sdk-backend/dpppt-backend-sdk package -Dmaven.test.skip=true
COPY dp3t-sdk-backend /build
RUN sed -i '/.*injectAllReactorProjects.*/i <skip>true</skip>' /build/dpppt-backend-sdk/pom.xml
RUN mvn -f dpppt-backend-sdk package -Dmaven.test.skip=true

FROM openjdk:11.0.7-jre-slim

RUN useradd app
WORKDIR /app/

COPY --from=build /build/dp3t-sdk-backend/dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.jar dpppt-backend-sdk-ws.jar
COPY --from=build /build/dpppt-backend-sdk/dpppt-backend-sdk-ws/target/dpppt-backend-sdk-ws.jar dpppt-backend-sdk-ws.jar
COPY logback.xml /app/logback.xml
COPY application.properties /app/application.properties

Expand Down

0 comments on commit c71bbd6

Please sign in to comment.