[IL-84]Environments

.env

@@ -1,4 +1,8 @@
-APP_ENV=prod
+APP_ENV=dev
+APP_VERSION=0.0.1-SNAPSHOT
 HUB=zufarexplainedit
-TAG=1.0.0-fix-docker-environment
-DATASOURCE_URL=jdbc:postgresql://postgresdb:5432/testdb
+TAG=1.0.0
+DATASOURCE_URL=jdbc:postgresql://postgresdb:5432/testdb?serverTimezone=UTC
+DATASOURCE_USERNAME=postgres
+DATASOURCE_PASSWORD=postgres
+SERVER_PORT=8083

Dockerfile

@@ -1,13 +1,36 @@
+#
+# Build stage with Maven
+#
 FROM maven:3.8.3-openjdk-17 as maven_build
 ENV HOME=/opt/app
-RUN mkdir -p $HOME
 WORKDIR $HOME
-ADD pom.xml $HOME
-RUN mvn verify --fail-never
-ADD ./ $HOME
-RUN mvn package
+COPY pom.xml ./
+COPY .env ./
+RUN set -ex; \
+    export APP_ENV=$(grep APP_ENV .env | cut -d '=' -f2) && \
+    mvn dependency:go-offline -P${APP_ENV}
+COPY . ./
+RUN chmod +x /opt/app/mvnw
+RUN set -ex; \
+    export APP_ENV=$(grep APP_ENV .env | cut -d '=' -f2) && \
+    mvn versions:set-property -Dproperty=project.version -DnewVersion=${APP_VERSION} && \
+    mvn package -P${APP_ENV}
 
-FROM eclipse-temurin:17-jre-jammy
-WORKDIR $HOME
-COPY --from=maven_build /opt/app/target/online-store-0.0.1-SNAPSHOT.jar /opt/app/online-store-0.0.1-SNAPSHOT.jar
-ENTRYPOINT ["java", "-jar", "/opt/app/online-store-0.0.1-SNAPSHOT.jar" ]
+#
+# Production stage
+#
+FROM eclipse-temurin:17-jre-jammy as prod
+WORKDIR /opt/app
+RUN apt-get update && \
+    apt-get install -y netcat && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+COPY --from=maven_build /opt/app/target/*.jar /opt/app/app.jar
+COPY --from=maven_build /opt/app/.env /opt/app/.env
+COPY --from=maven_build /opt/app/docker/docker-entrypoint.sh /opt/app/docker-entrypoint.sh
+RUN chmod +x /opt/app/docker-entrypoint.sh
+
+#
+# Entrypoint
+#
+ENTRYPOINT ["/opt/app/docker-entrypoint.sh"]

docker-compose.services.yml

@@ -18,12 +18,17 @@ services:
       - online-store-network
     volumes:
       - 'db:/var/lib/postgresql/data'
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+      interval: 30s
+      timeout: 10s
+      retries: 5
 
   sonarqube:
     image: sonarqube:latest
     container_name: onlinestore-sonarqube
     ports:
-      - "9011:9011"
+      - "9000:9000"
     networks:
       - online-store-network
     volumes:

docker-compose.yml

@@ -17,5 +17,3 @@ services:
       - '8083:8083'
     networks:
       - online-store-network
-    environment:
-      DATASOURCE_URL: ${DATASOURCE_URL}

docker/docker-entrypoint.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+APP_ENV=$(grep APP_ENV /opt/app/.env | cut -d '=' -f2)
+APP_VERSION=$(grep APP_VERSION /opt/app/.env | cut -d '=' -f2)
+DATASOURCE_URL=$(grep DATASOURCE_URL /opt/app/.env | cut -d '=' -f2)
+
+export APP_ENV
+export APP_VERSION
+export DATASOURCE_URL
+
+retries=0
+max_retries=20
+
+while ! nc -z postgresdb 5432; do
+  retries=$((retries + 1))
+  if [ $retries -ge $max_retries ]; then
+    echo "PostgresDB is not reachable. Exiting after $max_retries retries."
+    exit 1
+  fi
+
+  echo "Waiting for PostgresDB... Retry $retries"
+  sleep 3
+done
+
+exec java -jar /opt/app/app.jar