fix: missing .dockerignore

docker/.env.docker

@@ -0,0 +1,3 @@
+REDIS_URL=redis://redis
+POSTGRESQL_URL=jdbc:postgresql://postgresql/event-demo
+RABBITMQ_URL=rabbitmq

docker/.env.template

@@ -1 +0,0 @@
-PGADMIN_DEFAULT_EMAIL=

docker/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Cache Gradle dependencies
-FROM gradle:latest AS cache
+FROM gradle:9.6.1-jdk21-alpine AS cache
 RUN mkdir -p /home/gradle/cache_home
 ENV GRADLE_USER_HOME=/home/gradle/cache_home
 COPY build.gradle.* gradle.properties /home/gradle/app/
@@ -7,7 +7,7 @@ WORKDIR /home/gradle/app
 RUN gradle build -i -x check
 
 # Stage 2: Build Application
-FROM gradle:latest AS build
+FROM gradle:9.6.1-jdk21-alpine AS build
 COPY --from=cache /home/gradle/cache_home /home/gradle/.gradle
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
@@ -16,8 +16,8 @@ WORKDIR /home/gradle/src
 RUN gradle buildFatJar --no-daemon
 
 # Stage 3: Create the Runtime Image
-FROM amazoncorretto:21 AS runtime
+FROM eclipse-temurin:21-jre-alpine AS runtime
 EXPOSE 8080
 RUN mkdir /app
-COPY --from=build /home/gradle/src/build/libs/*.jar /app/event-demo-all.jar
+COPY --from=build /home/gradle/src/build/libs/*-all.jar /app/event-demo-all.jar
 ENTRYPOINT ["java","-jar","/app/event-demo-all.jar"]

docker/DockerfileTest

@@ -1,8 +1,8 @@
 # Image officielle Gradle avec JDK 21 déjà installé
 FROM gradle:9.6.1-jdk21
- 
+
 WORKDIR /app
- 
+
 # Copie du wrapper et des fichiers de config en premier pour profiter du cache Docker
 COPY build.gradle.kts settings.gradle.kts ./
 

docker/docker-compose-ci.yaml

@@ -1,5 +0,0 @@
-name: event-demo-ci
-include:
-  - path:
-    - parts/docker-compose-databases.yaml
-    - parts/docker-compose-databases-expose.yaml

docker/docker-compose-dev.yaml

@@ -1,8 +1,17 @@
-name: event-demo-test
+name: event-demo-dev
 include:
   - path:
       - parts/docker-compose-databases.yaml
       - parts/docker-compose-databases-expose.yaml
       - parts/docker-compose-tools.yaml
       - parts/docker-compose-tools-local.yaml
-      - parts/docker-compose-traefik.yaml
+      - parts/docker-compose-traefik.yaml
+
+services:
+  postgresql:
+    environment:
+      POSTGRES_PASSWORD: "changeit"
+
+  pgadmin:
+    environment:
+      PGADMIN_DEFAULT_PASSWORD: "changeit"

docker/docker-compose-prod.yaml

@@ -5,3 +5,16 @@ include:
     - parts/docker-compose-app.yaml
     - parts/docker-compose-tools.yaml
     - parts/docker-compose-traefik.yaml
+
+services:
+  postgresql:
+    environment:
+      POSTGRES_PASSWORD_FILE: /run/secrets/postgresql_password
+    volumes:
+      - ./postgresql.secret:/run/secrets/postgresql_password:ro
+
+  pgadmin:
+    environment:
+      PGADMIN_DEFAULT_PASSWORD_FILE: /run/secrets/pgadmin_password
+    volumes:
+      - ./pgadmin.secret:/run/secrets/pgadmin_password:ro

docker/docker-compose-test.yaml

@@ -3,4 +3,13 @@ include:
   - path:
     - parts/docker-compose-databases.yaml
     - parts/docker-compose-test.yaml
-    - parts/docker-compose-traefik.yaml
+    - parts/docker-compose-traefik.yaml
+
+services:
+  postgresql:
+    environment:
+      POSTGRES_PASSWORD: "changeit"
+
+  pgadmin:
+    environment:
+      PGADMIN_DEFAULT_PASSWORD: "changeit"

docker/parts/docker-compose-app.yaml

@@ -12,6 +12,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+    env_file:
+      - ../.env.docker
     labels:
       - "traefik.http.routers.api.rule=Host(`api.traefik.me`)"
       - "traefik.http.services.api.loadbalancer.server.port=8080"

docker/parts/docker-compose-databases.yaml

@@ -22,7 +22,6 @@ services:
     image: postgres:18.4
     command: postgres -c 'max_connections=500'
     environment:
-      POSTGRES_PASSWORD_FILE: /run/secrets/postgresql_password
       POSTGRES_USER: event-demo
     healthcheck:
       test: ["CMD-SHELL", "sh -c 'pg_isready -U event-demo'"]
@@ -31,7 +30,6 @@ services:
       retries: 10
     volumes:
       - postgresql_data:/var/lib/postgresql
-      - ../postgresql.secret:/run/secrets/postgresql_password:ro
 
   rabbitmq:
     image: rabbitmq:4-management-alpine

docker/parts/docker-compose-test.yaml

@@ -15,6 +15,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
+    env_file:
+      - ../.env.docker
 
 volumes:
   gradle-cache:

docker/parts/docker-compose-tools.yaml

@@ -2,10 +2,7 @@ services:
   pgadmin:
     image: dpage/pgadmin4
     environment:
-      PGADMIN_DEFAULT_EMAIL: $PGADMIN_DEFAULT_EMAIL
-      PGADMIN_DEFAULT_PASSWORD_FILE: /run/secrets/pgadmin_password
-    secrets:
-      - pgadmin_password
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-admin@event-demo.dev}
     volumes:
       - pgadmin_data:/var/lib/pgadmin
     configs:
@@ -45,9 +42,5 @@ configs:
         }
       }
 
-secrets:
-  pgadmin_password:
-    file: ../pgadmin.secret
-
 volumes:
   pgadmin_data: