Change docker image names (#571)

* Change docker image names * Update docker-compose.yml * Update docker-compose-up.yml
data2evidence · Jan 11, 2025 · 9918f87 · 9918f87
1 parent 6ae7afd
commit 9918f87
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/.github/workflows/docker-compose-up.yml b/.github/workflows/docker-compose-up.yml
@@ -103,12 +103,18 @@ jobs:
       #     path: |
       #       ${{ github.job }}*.yml
 
-      - name: Login to ACR
-        uses: docker/[email protected]
+      #- name: Login to ACR
+      #  uses: docker/[email protected]
+      #  with:
+      #    registry: alpcr.azurecr.io
+      #    username: ${{ env.REGISTRY_USERNAME }}
+      #    password: ${{ env.REGISTRY_PASSWORD }}
+      - name: 'Login to GitHub Container Registry'
+        uses: docker/login-action@v3
         with:
-          registry: alpcr.azurecr.io
-          username: ${{ env.REGISTRY_USERNAME }}
-          password: ${{ env.REGISTRY_PASSWORD }}
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
 
       - uses: docker/setup-buildx-action@v3
         id: builder1

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -94,32 +94,32 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: alp-data-node/alp-dataflow-gen
+          - name: d2e-dataflow-gen
             directory: ./services/alp-dataflow-gen
             context: .
             fileName: Dockerfile
             pull: true
-          - name: alp-data-node/alp-pg-mgmt-init
+          - name: d2e-pg-mgmt-init
             directory: ./services/alp-pg-management
             context: ./services/alp-pg-management
             fileName: Dockerfile
-          - name: alp-data-node/alp-logto
+          - name: d2e-logto
             directory: ./services/alp-logto
             context: ./services/alp-logto
             fileName: Dockerfile
-          - name: alp-data-node/alp-logto-post-init
+          - name: d2e-logto-post-init
             directory: ./services/alp-logto/post-init
             context: ./services/alp-logto/post-init
             fileName: Dockerfile
-          - name: alp-data-node/alp-fhir-server
+          - name: d2e-fhir-server
             directory: ./services/alp-fhir
             context: ./services/alp-fhir
             fileName: Dockerfile
-          - name: alp-data-node/alp-fhir-fe-server
+          - name: d2e-fhir-fe-server
             directory: ./services/alp-fhir
             context: ./services/alp-fhir
             fileName: Dockerfile.frontend
-          - name: alp-data-node/cachedb
+          - name: d2e-cachedb
             directory: ./services/cachedb
             context: .
             fileName: Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -106,7 +106,7 @@ services:
       alp-minio-post-init:
         condition: service_completed_successfully
     hostname: trex.${TLS__INTERNAL__DOMAIN:-alp.local}
-    image: alpcr.azurecr.io/d2e-trex-base:${DOCKER_TREX_TAG_NAME:-develop}
+    image: ghcr.io/data2evidence/d2e-trex-base:${DOCKER_TREX_TAG_NAME:-develop}
     pull_policy: always
     platform: linux/amd64
     logging:
@@ -414,7 +414,7 @@ services:
       alp-minerva-postgres:
         condition: service_healthy
     hostname: alp-minerva-pg-mgmt-init-${BASE_PORT:-1}.${TLS__INTERNAL__DOMAIN:-alp.local}
-    image: alpcr.azurecr.io/alp-data-node/alp-pg-mgmt-init:${DOCKER_TAG_NAME:-develop}
+    image: ghcr.io/data2evidence/d2e-pg-mgmt-init:${DOCKER_TAG_NAME:-develop}
     logging:
       options:
         tag: *c15
@@ -609,7 +609,7 @@ services:
       alp-minio-post-init:
         condition: service_completed_successfully
     hostname: alp-dataflow-gen-init-${BASE_PORT:-1}.${TLS__INTERNAL__DOMAIN:-alp.local}
-    image: alpcr.azurecr.io/alp-data-node/alp-dataflow-gen:${DOCKER_TAG_NAME:-develop}
+    image: ghcr.io/data2evidence/d2e-dataflow-gen:${DOCKER_TAG_NAME:-develop}
     logging:
       options:
         tag: *c4
@@ -661,7 +661,7 @@ services:
     depends_on:
       alp-logto:
         condition: service_healthy
-    image: alpcr.azurecr.io/alp-data-node/alp-logto-post-init:${DOCKER_TAG_NAME:-develop}
+    image: ghcr.io/data2evidence/d2e-logto-post-init:${DOCKER_TAG_NAME:-develop}
     networks:
       alp:
         priority: 20
@@ -698,7 +698,7 @@ services:
         - logto.status
         - http://localhost:3001/api/status
     hostname: alp-logto-${BASE_PORT:-1}.${TLS__INTERNAL__DOMAIN:-alp.local}
-    image: alpcr.azurecr.io/alp-data-node/alp-logto:${DOCKER_TAG_NAME:-develop}
+    image: ghcr.io/data2evidence/d2e-logto:${DOCKER_TAG_NAME:-develop}
     logging:
       options:
         tag: *c8
@@ -846,7 +846,7 @@ services:
   alp-cachedb:
     container_name: &c30 alp-cachedb
     hostname: alp-cachedb.${TLS__INTERNAL__DOMAIN:-alp.local}
-    image: alpcr.azurecr.io/alp-data-node/cachedb:${DOCKER_TAG_NAME:-develop}
+    image: ghcr.io/data2evidence/d2ecachedb:${DOCKER_TAG_NAME:-develop}
     platform: linux/amd64
     depends_on:
       trex:
@@ -896,7 +896,7 @@ services:
           memory: ${D2E_MEMORY_LIMIT:-7G}
 
   alp-perseus-backend:
-    image: alpcr.azurecr.io/alp-data-node/d2e-perseus:master
+    image: ghcr.io/data2evidence/d2e-perseus:master
     container_name: &c35 alp-perseus-backend-${BASE_PORT:-1}
     environment:
       <<:
@@ -917,7 +917,7 @@ services:
     profiles: [perseus]
 
   alp-perseus-white-rabbit:
-    image: alpcr.azurecr.io/whiterabbit:master
+    image: ghcr.io/data2evidence/whiterabbit:master
     container_name: &c36 alp-perseus-white-rabbit-${BASE_PORT:-1}
     platform: linux/amd64
     environment: