diff --git a/dmp-backend/Docker/dmp-backend.env b/dmp-backend/Docker/dmp-backend.env deleted file mode 100644 index 50fb7881d..000000000 --- a/dmp-backend/Docker/dmp-backend.env +++ /dev/null @@ -1 +0,0 @@ -PROFILE=docker \ No newline at end of file diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile index 0377f3cf3..e88f1d175 100644 --- a/dmp-backend/Dockerfile +++ b/dmp-backend/Dockerfile @@ -5,9 +5,9 @@ ARG MAVEN_ACCOUNT_USR ARG MAVEN_ACCOUNT_PSW ARG REVISION ARG PROFILE -ARG DEV_PROFILE_URL ENV server_username=$MAVEN_ACCOUNT_USR ENV server_password=$MAVEN_ACCOUNT_PSW +ARG CITE_MAVEN_REPO_URL COPY pom.xml /build/ COPY core /build/core/ @@ -19,9 +19,10 @@ RUN rm -f /build/annotation-web/src/main/resources/logging/*.xml WORKDIR /build/ #RUN mvn package -q -RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} dependency:go-offline +RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean +RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install # Build project -RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} clean package +RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package ######################################## Run Stage ######################################## FROM eclipse-temurin:21-jre-alpine @@ -35,4 +36,4 @@ EXPOSE ${SERVER_PORT} COPY --from=build-stage /build/web/target/web-${REVISION}.jar /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 +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=/files/config/", "-cp", "/app/app.jar"] \ No newline at end of file diff --git a/dmp-backend/Dockerfile.CI b/dmp-backend/Dockerfile.CI deleted file mode 100644 index e95d54371..000000000 --- a/dmp-backend/Dockerfile.CI +++ /dev/null @@ -1,34 +0,0 @@ -####################################### Build stage ####################################### -FROM maven:3.9-eclipse-temurin-21-alpine AS build-stage - -ARG MAVEN_ACCOUNT_USR -ARG MAVEN_ACCOUNT_PSW -ARG REVISION -ARG PROFILE -ARG DEV_PROFILE_URL -ENV server_username=$MAVEN_ACCOUNT_USR -ENV server_password=$MAVEN_ACCOUNT_PSW - -COPY pom.xml /build/ -COPY core /build/core -#COPY elastic /build/elastic/ -COPY web /build/web/ -COPY settings.xml /root/.m2/settings.xml -RUN rm -f /build/web/src/main/resources/config/*-dev.yml - -WORKDIR /build/ - -RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} dependency:go-offline -# Build project -RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} clean package - -######################################## Run Stage ######################################## -FROM eclipse-temurin:21-jre-alpine - -WORKDIR /app - -ARG PROFILE -ARG REVISION - -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/settings.xml b/dmp-backend/settings.xml index 42318e876..847f42c30 100644 --- a/dmp-backend/settings.xml +++ b/dmp-backend/settings.xml @@ -4,22 +4,28 @@ - dev + cite-repo ${server_username} ${server_password} - dev + release - - true - - dev - Dev Profile - ${devProfileUrl} + central + Central Repository + https://repo.maven.apache.org/maven2 + default + + false + + + + cite-repo + CITE Maven Repo + ${citeMavenRepoUrl}