DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity

Fix Docker build due to missing json-smart version #107

Merged
tozh4728 merged 1 commits from fix-dockerfile-json-smart into develop 2025-02-12 13:28:14 +01:00
Conversation 2 Commits 1 Files Changed 2 -48
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -13,12 +13,6 @@ COPY view/pom.xml view/pom.xml
COPY war/pom.xml war/pom.xml 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
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/
COPY view/src/ view/src/ COPY view/src/ view/src/
@ -26,7 +20,6 @@ COPY war/src/ war/src/
COPY daisy-integration/src/ daisy-integration/src/ COPY daisy-integration/src/ daisy-integration/src/
RUN ./mvnw package \ RUN ./mvnw package \
--offline \
--define skipTests \ --define skipTests \
--activate-profiles branch,DEV \ --activate-profiles branch,DEV \
--define skip.npm \ --define skip.npm \

41
war/pom.xml
View File

@ -140,46 +140,5 @@
<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>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles> </profiles>
</project> </project>