diff --git a/backend/Dockerfile b/backend/Dockerfile index 32b5ac1..fc44418 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -41,4 +41,6 @@ COPY profiles ./profiles EXPOSE 8080 -CMD ["java", "-jar", "app.jar"] +COPY entrypoint.sh . +RUN chmod +x entrypoint.sh +ENTRYPOINT ["./entrypoint.sh"] diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh new file mode 100644 index 0000000..17d5cf5 --- /dev/null +++ b/backend/entrypoint.sh @@ -0,0 +1,13 @@ +#!/bin/sh +echo "----------------------------------------------------------------" +echo "Starting Backend Application" +echo "DB_URL: $DB_URL" +echo "DB_USERNAME: $DB_USERNAME" +echo "SLICER_PATH: $SLICER_PATH" +echo "----------------------------------------------------------------" + +# Exec java with explicit properties from env +exec java -jar app.jar \ + --spring.datasource.url="${DB_URL}" \ + --spring.datasource.username="${DB_USERNAME}" \ + --spring.datasource.password="${DB_PASSWORD}" diff --git a/docker-compose.deploy.yml b/docker-compose.deploy.yml index f69fde2..50bfa15 100644 --- a/docker-compose.deploy.yml +++ b/docker-compose.deploy.yml @@ -17,7 +17,7 @@ services: restart: always volumes: - backend_profiles_${ENV}:/app/profiles - command: ["sh", "-c", "echo 'DB_URL IS: $DB_URL'; java -jar app.jar --spring.datasource.url=${DB_URL} --spring.datasource.username=${DB_USERNAME} --spring.datasource.password=${DB_PASSWORD}"] + frontend: image: ${REGISTRY_URL}/${REPO_OWNER}/print-calculator-frontend:${TAG}