DMC/scipro
7
0
Fork 0
Code Issues 20 Pull Requests 5 Actions Projects 1 Wiki Activity

WIP: Automate deployment of pull requests #15

Draft
ansv7779 wants to merge 6 commits from branch-deploy into develop
pull from: branch-deploy
merge into: DMC:develop
Conversation 1 Commits 6 Files Changed 469 +38 -2
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ccb18fbc5a - Show all commits

4
Dockerfile
View File

@ -14,7 +14,7 @@ COPY war/pom.xml war/pom.xml
COPY daisy-integration/pom.xml daisy-integration/pom.xml COPY daisy-integration/pom.xml daisy-integration/pom.xml
# Download dependencies in a separate layer to allow caching for future builds # Download dependencies in a separate layer to allow caching for future builds
RUN ./mvnw dependency:go-offline --batch-mode --define includeScope=compile RUN ./mvnw dependency:go-offline --batch-mode --define includeScope=compile --activate-profiles docker-dependencies
COPY api/src/ api/src/ COPY api/src/ api/src/
COPY core/src/ core/src/ COPY core/src/ core/src/
@ -22,7 +22,7 @@ COPY view/src/ view/src/
COPY war/src/ war/src/ COPY war/src/ war/src/
COPY daisy-integration/src/ daisy-integration/src/ COPY daisy-integration/src/ daisy-integration/src/
RUN ./mvnw package --define skipTests --activate-profiles branch,DEV RUN ./mvnw package --offline --define skipTests --activate-profiles branch,DEV
FROM tomcat:10 AS run FROM tomcat:10 AS run

36
war/pom.xml
View File

@ -140,5 +140,41 @@
<spring.profile.active>branch</spring.profile.active> <spring.profile.active>branch</spring.profile.active>
</properties> </properties>
</profile> </profile>
<profile>
<id>docker-dependencies</id>
<!--
Some dependencies are not discovered by default when running dependency:go-offline.
They are added here manually to allow Docker build layers to be cached properly.
-->
<dependencies>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>classmate</artifactId>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
</dependency>
<dependency>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${querydsl.version}</version>
<classifier>jakarta</classifier>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</dependency>
</dependencies>
</profile>
</profiles> </profiles>
</project> </project>