[chore] - (CI): Use services in dockerbuild #885

Author: hervyt

.github/workflows/dockerbuild-ci.yml

@@ -92,6 +92,36 @@ jobs:
       contents: read
       packages: write
       pull-requests: write
+    services:
+      postgres:
+        image: postgres:17.2
+        env:
+          POSTGRES_USER: portal
+          POSTGRES_PASSWORD: portal-password
+          POSTGRES_DB: test_database
+          PGDATA: /data/postgres
+        options: >-
+          --health-cmd "pg_isready -d test_database"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 5432:5432
+      elasticsearch:
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.18.3
+        env:
+          discovery.type: single-node
+          xpack.ml.enabled: false
+          xpack.security.enabled: false
+          ES_JAVA_OPTS: "-Xms256m -Xmx256m"
+        options: >-
+          --health-cmd "curl --silent --fail localhost:9200/_cluster/health?wait_for_status=yellow&timeout=5s || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -112,10 +142,37 @@ jobs:
         run: |
           mkdir -p ctrf
           export IMAGE_TAGS="${{ needs.build-images-tests.outputs.docker-tags }}" \
-           TEAMS_WEBHOOK_E2E="${{ secrets.TEAMS_WEBHOOK_E2E }}" \
-           GITHUB_PR_TITLE="${{ github.event.pull_request.title }}" \
-           GITHUB_PR_NUMBER="${{ github.event.pull_request.number }}" \
-           GITHUB_RUN_ID="${{ github.run_id }}"
+          export TEAMS_WEBHOOK_E2E="${{ secrets.TEAMS_WEBHOOK_E2E }}" \
+          export GITHUB_PR_TITLE="${{ github.event.pull_request.title }}" \
+          export GITHUB_PR_NUMBER="${{ github.event.pull_request.number }}" \
+          export GITHUB_RUN_ID="${{ github.run_id }}"
+          echo "Starting portal-api to check logs..."
+          docker run --rm \
+            --network host \
+            -e PORT=4001 \
+            -e DATABASE_HOST=localhost \
+            -e DATABASE_PORT=5432 \
+            -e DATABASE_USER=portal \
+            -e DATABASE_BASE=test_database \
+            -e DATABASE_PASSWORD=portal-password \
+            -e [email protected] \
+            -e ADMIN_PASSWORD=admin \
+            -e DATA_SEEDING=true \
+            -e MINIO_BUCKET_NAME=xtmhubbucket \
+            -e MINIO_ENDPOINT=localhost \
+            -e MINIO_PORT=9000 \
+            -e MINIO_ACCESS_KEY=portal \
+            -e MINIO_SECRET_KEY=changeme \
+            -e MINIO_USE_SSL=false \
+            -e NODE_ENV=development \
+            -e VITEST_MODE=true \
+            -e START_DEV_SERVER=true \
+            -e ELASTIC_HOST=localhost \
+            -e ELASTIC_PORT=9200 \
+            -e BASE_URL_FRONT=http://localhost:3000 \
+            filigran/portal-api:${IMAGE_TAGS} || {
+              echo "Portal API failed to start. This is expected for debugging."
+            }
           docker compose -f ./xtm-hub-dev/docker-compose-ci.yml run portal-e2e-tests || TEST_EXIT_CODE=$?
           CONTAINER_ID=$(docker ps -a --filter "name=portal-e2e-tests-run" --format "{{.ID}}" | head -1)
           docker cp $CONTAINER_ID:/app/apps/portal-e2e-tests/ctrf/. ./ctrf/

xtm-hub-dev/docker-compose-ci.yml

@@ -6,106 +6,87 @@ services:
       options:
         max-size: "10m"
         max-file: "3"
-    build:
-      context: ../
-      dockerfile: apps/portal-front/Dockerfile
-      cache_from:
-        - type=registry,ref=filigran/portal-front:cache-${IMAGE_TAGS}
-        - type=registry,ref=filigran/portal-front:main
-        - type=registry,ref=filigran/portal-front:development
-    depends_on:
-      portal-api:
-        condition: service_healthy
+    image: filigran/portal-front:${IMAGE_TAGS}
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://portal-front:3000/health"]
+      test: ["CMD", "wget", "-qO-", "http://localhost:3002/health"]
       interval: 10s
       timeout: 5s
       retries: 10
-    environment:
-      - SERVER_HTTP_API=http://portal-api:4001
-
-  portal-front-test:
-    container_name: portal-front-test
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    build:
-      context: ../
-      dockerfile: apps/portal-front/test.Dockerfile
-      cache_from:
-        - type=registry,ref=filigran/portal-front:cache-${IMAGE_TAGS}
-        - type=registry,ref=filigran/portal-front:main
-        - type=registry,ref=filigran/portal-front:development
-    environment:
-      - SERVER_HTTP_API=http://portal-api:4001
-    volumes:
-      - "./coverage:/app/apps/portal-front/coverage"
-  portal-api-test:
-    container_name: portal-api-test
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    build:
-      context: ../
-      dockerfile: apps/portal-api/test.Dockerfile
-      cache_from:
-        - type=registry,ref=filigran/portal-api:cache-${IMAGE_TAGS}
-        - type=registry,ref=filigran/portal-api:main
-        - type=registry,ref=filigran/portal-api:development
     depends_on:
-      portal-postgres:
-        condition: service_healthy
-      portal-minio:
+      portal-api:
         condition: service_healthy
     environment:
-      - DATABASE_HOST=portal-postgres
-      - DATABASE_PORT=5432
-      - DATABASE_USER=portal
-      - DATABASE_BASE=postgres
-      - DATABASE_PASSWORD=portal-password
-      - [email protected]
-      - ADMIN_PASSWORD=admin
-      - NODE_ENV=development
-      - MINIO_BUCKET_NAME=xtmhubbucket
-      - MINIO_ENDPOINT=portal-minio
-      - MINIO_PORT=9000
-      - MINIO_ACCESS_KEY=minio
-      - MINIO_SECRET_KEY=password
-      - MINIO_USE_SSL=false
-    volumes:
-      - "./coverage:/app/apps/portal-api/coverage"
+      - PORT=3002
+      - SERVER_HTTP_API=http://localhost:4002
+#
+#  portal-front-test:
+#    container_name: portal-front-test
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "10m"
+#        max-file: "3"
+#    build:
+#      context: ../
+#      dockerfile: apps/portal-front/test.Dockerfile
+#      cache_from:
+#        - type=registry,ref=filigran/portal-front:cache-${IMAGE_TAGS}
+#        - type=registry,ref=filigran/portal-front:main
+#        - type=registry,ref=filigran/portal-front:development
+#    environment:
+#      - SERVER_HTTP_API=http://portal-api:4001
+#    volumes:
+#      - "./coverage:/app/apps/portal-front/coverage"
+#  portal-api-test:
+#    container_name: portal-api-test
+#    logging:
+#      driver: "json-file"
+#      options:
+#        max-size: "10m"
+#        max-file: "3"
+#    build:
+#      context: ../
+#      dockerfile: apps/portal-api/test.Dockerfile
+#      cache_from:
+#        - type=registry,ref=filigran/portal-api:cache-${IMAGE_TAGS}
+#        - type=registry,ref=filigran/portal-api:main
+#        - type=registry,ref=filigran/portal-api:development
+#    environment:
+#      - DATABASE_HOST=postgres
+#      - DATABASE_PORT=5432
+#      - DATABASE_USER=portal
+#      - DATABASE_BASE=postgres
+#      - DATABASE_PASSWORD=portal-password
+#      - [email protected]
+#      - ADMIN_PASSWORD=admin
+#      - NODE_ENV=development
+#      - MINIO_BUCKET_NAME=xtmhubbucket
+#      - MINIO_ENDPOINT=minio
+#      - MINIO_PORT=9000
+#      - MINIO_ACCESS_KEY=minio
+#      - MINIO_SECRET_KEY=password
+#      - MINIO_USE_SSL=false
+#    volumes:
+#      - "./coverage:/app/apps/portal-api/coverage"
   portal-api:
     container_name: portal-api
     logging:
       driver: "json-file"
       options:
         max-size: "10m"
         max-file: "3"
-    build:
-      context: ../
-      dockerfile: apps/portal-api/Dockerfile
-      cache_from:
-        - type=registry,ref=filigran/portal-api:cache-${IMAGE_TAGS}
-        - type=registry,ref=filigran/portal-api:main
-        - type=registry,ref=filigran/portal-api:development
+    image: filigran/portal-api:${IMAGE_TAGS}
+    network_mode: "host"
     healthcheck:
-      test: ["CMD", "wget", "-qO-", "http://portal-api:4001/health"]
+      test: ["CMD", "wget", "-qO-", "http://localhost:4002/health"]
       interval: 10s
       timeout: 5s
       retries: 10
-    depends_on:
-      portal-postgres:
-        condition: service_healthy
-      portal-minio:
-        condition: service_healthy
-      portal-elasticsearch:
-        condition: service_healthy
     environment:
-      - DATABASE_HOST=portal-postgres
+      - PORT=4002
+      - DATABASE_HOST=localhost
       - DATABASE_PORT=5432
       - DATABASE_USER=portal
       - DATABASE_BASE=test_database
@@ -114,56 +95,17 @@ services:
       - ADMIN_PASSWORD=admin
       - DATA_SEEDING=true
       - MINIO_BUCKET_NAME=xtmhubbucket
-      - MINIO_ENDPOINT=portal-minio
+      - MINIO_ENDPOINT=minio
       - MINIO_PORT=9000
       - MINIO_ACCESS_KEY=portal
       - MINIO_SECRET_KEY=changeme
       - MINIO_USE_SSL=false
       - NODE_ENV=development
       - VITEST_MODE=true
       - START_DEV_SERVER=true
-      - ELASTIC_HOST=portal-elasticsearch
+      - ELASTIC_HOST=localhost
       - ELASTIC_PORT=9200
-      - BASE_URL_FRONT=http://portal-front:3000
-
-  portal-postgres:
-    container_name: portal-postgres
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    image: postgres:17.2
-    environment:
-      - POSTGRES_USER=portal
-      - POSTGRES_PASSWORD=portal-password
-      - POSTGRES_DB=test_database
-      - PGDATA=/data/postgres
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "test_database"]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
-  portal-elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.3
-    container_name: portal-elasticsearch
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    environment:
-      - discovery.type=single-node
-      - xpack.ml.enabled=false
-      - xpack.security.enabled=false
-      - "ES_JAVA_OPTS=-Xms256m -Xmx256m"
-    healthcheck:
-      test: [ "CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health?wait_for_status=yellow&timeout=5s || exit 1" ]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-
+      - BASE_URL_FRONT=http://portal-front:3002
 
   portal-minio:
     container_name: portal-minio
@@ -189,25 +131,18 @@ services:
       options:
         max-size: "10m"
         max-file: "3"
-    build:
-      context: ../
-      dockerfile: apps/portal-e2e-tests/Dockerfile
-      cache_from:
-        - type=registry,ref=filigran/portal-e2e-tests:cache-${IMAGE_TAGS}
-        - type=registry,ref=filigran/portal-e2e-tests:main
-        - type=registry,ref=filigran/portal-e2e-tests:development
+    image: filigran/portal-e2e-tests:${IMAGE_TAGS}
+    network_mode: "host"
     depends_on:
       portal-front:
         condition: service_healthy
       portal-api:
         condition: service_healthy
-      portal-minio:
-        condition: service_healthy
     environment:
-      - E2E_BASE_URL=http://portal-front:3000
-      - E2E_API_URL=http://portal-api:4001
+      - E2E_BASE_URL=http://portal-front:3002
+      - E2E_API_URL=http://portal-api:4002
       - POSTGRES_USER=portal
-      - DATABASE_HOST=portal-postgres
+      - DATABASE_HOST=localhost
       - POSTGRES_DB=test_database
       - POSTGRES_PASSWORD=portal-password
       - DATABASE_PORT=5432