diff --git a/Dockerfile b/Dockerfile index 372dde9..ccba704 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ COPY application/pom.xml application/ COPY infrastructure/pom.xml infrastructure/ COPY bootstrap/pom.xml bootstrap/ COPY common/pom.xml common/ -ARG XPEDITIS_PROFILE -RUN mvn -P${XPEDITIS_PROFILE} dependency:go-offline \ +ARG SPRING_PROFILES_ACTIVE +RUN mvn -P${SPRING_PROFILES_ACTIVE} dependency:go-offline \ && mvn dependency:get -Dartifact=net.bytebuddy:byte-buddy-agent:1.15.11 -B \ && mvn dependency:get -Dartifact=org.mapstruct:mapstruct-processor:1.6.3 -B \ && mvn dependency:get -Dartifact=org.projectlombok:lombok-mapstruct-binding:0.2.0 -B \ @@ -30,8 +30,8 @@ COPY application/src application/src COPY infrastructure/src infrastructure/src COPY bootstrap/src bootstrap/src COPY common/src common/src -ARG XPEDITIS_PROFILE -RUN mvn -o clean package -P${XPEDITIS_PROFILE} -Dmaven.test.skip=true -DskipTests +ARG SPRING_PROFILES_ACTIVE +RUN mvn -o clean package -P${SPRING_PROFILES_ACTIVE} -Dmaven.test.skip=true -DskipTests #FROM builder AS test #RUN mvn -o clean test @@ -45,5 +45,3 @@ RUN chmod +x wait-for-it.sh COPY entrypoint.sh ./ RUN chmod +x entrypoint.sh ENTRYPOINT ["./entrypoint.sh"] -#CMD ["java", "-jar", "-Dserver.port=8080", "leblr.jar"] -#HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "curl", "--fail", "http://localhost:8080/actuator/health", "|| exit 1" ] diff --git a/Dockerfile-springboot b/Dockerfile-springboot index ce9b9ef..e551f97 100644 --- a/Dockerfile-springboot +++ b/Dockerfile-springboot @@ -17,8 +17,8 @@ COPY application/pom.xml application/ COPY infrastructure/pom.xml infrastructure/ COPY bootstrap/pom.xml bootstrap/ COPY common/pom.xml common/ -ARG XPEDITIS_PROFILE -RUN ./mvnw -P${XPEDITIS_PROFILE} dependency:go-offline \ +ARG SPRING_PROFILES_ACTIVE +RUN ./mvnw -P${SPRING_PROFILES_ACTIVE} dependency:go-offline \ && ./mvnw dependency:get -Dartifact=net.bytebuddy:byte-buddy-agent:1.15.11 -B \ && ./mvnw dependency:get -Dartifact=org.mapstruct:mapstruct-processor:1.6.3 -B \ && ./mvnw dependency:get -Dartifact=org.projectlombok:lombok-mapstruct-binding:0.2.0 -B diff --git a/compose.yml b/compose.yml index 51c261e..36807d2 100644 --- a/compose.yml +++ b/compose.yml @@ -33,13 +33,13 @@ services: container_name: db back: - image: leblr-backend + image: xpeditis-backend restart: always build: context: . dockerfile: Dockerfile args: - XPEDITIS_PROFILE: prod + SPRING_PROFILES_ACTIVE: dev secrets: - mysql-user - mysql-password