diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile index 3087527bb..4d939cb6c 100644 --- a/dmp-backend/Dockerfile +++ b/dmp-backend/Dockerfile @@ -30,7 +30,8 @@ FROM eclipse-temurin:21-jre-alpine WORKDIR /app ARG PROFILE +ARG REVISION -COPY --from=build-stage /build/web/target/web-1.0.0-SNAPSHOT.jar /app.jar +COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app.jar ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROFILE}","-jar","/app.jar"] \ No newline at end of file diff --git a/dmp-backend/Dockerfile.CI b/dmp-backend/Dockerfile.CI index 7da2659fc..e95d54371 100644 --- a/dmp-backend/Dockerfile.CI +++ b/dmp-backend/Dockerfile.CI @@ -30,5 +30,5 @@ WORKDIR /app ARG PROFILE ARG REVISION -COPY --from=build-stage /build/web/target/web-1.0.0-SNAPSHOT.jar /app/app.jar +COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app/app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=/files/config/", "-cp", "/app/app.jar", "-Dloader.path=/files/repo-jars", "org.springframework.boot.loader.PropertiesLauncher"] \ No newline at end of file diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml index 08acce2d7..a08b649b6 100644 --- a/dmp-backend/core/pom.xml +++ b/dmp-backend/core/pom.xml @@ -6,12 +6,16 @@ eu.eudat dmp-backend - 1.0.0-SNAPSHOT + ${revision} eu.eudat core - 1.0.0-SNAPSHOT + ${revision} + + + 1.0.0-SNAPSHOT + UTF-8 diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index 6e54cf9b8..22e63c0f7 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -4,7 +4,7 @@ 4.0.0 eu.eudat dmp-backend - 1.0.0-SNAPSHOT + ${revision} pom @@ -30,7 +30,7 @@ 4.11 1.2.17 2.15.0 - + 1.0.0-SNAPSHOT 21 21 21 diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml index 50505c479..46e397b63 100644 --- a/dmp-backend/web/pom.xml +++ b/dmp-backend/web/pom.xml @@ -6,20 +6,20 @@ dmp-backend web - 1.0.0-SNAPSHOT + ${revision} ${packaging.type} eu.eudat dmp-backend - 1.0.0-SNAPSHOT + ${revision} eu.eudat core - 1.0.0-SNAPSHOT + ${revision} gr.cite.opendmp @@ -273,5 +273,6 @@ 21 21 21 + 1.0.0-SNAPSHOT \ No newline at end of file