Update Docker image tags to use GHCR repo

alephdata · Apr 28, 2023 · fd95e90 · fd95e90
1 parent f1ceb95
commit fd95e90
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -76,7 +76,7 @@ build:
 	$(COMPOSE) build
 
 build-ui:
-	docker build -t alephdata/aleph-ui-production:$(ALEPH_TAG) -f ui/Dockerfile.production ui
+	docker build -t ghcr.io/alephdata/aleph-ui-production:$(ALEPH_TAG) -f ui/Dockerfile.production ui
 
 build-full: build build-ui
 

diff --git a/contrib/aleph-traefik-minio-keycloak/docker-compose.yml b/contrib/aleph-traefik-minio-keycloak/docker-compose.yml
@@ -65,7 +65,7 @@ services:
       - "traefik.enable=false"
 
   worker:
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.0}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: aleph worker
     restart: on-failure
     links:
@@ -90,11 +90,7 @@ services:
       - "traefik.enable=false"
 
   shell:
-<<<<<<< HEAD
-    image: alephdata/aleph:${ALEPH_TAG:-3.12.2}
-=======
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.0}
->>>>>>> 5f1660221 (Update to the latest Aleph version)
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: /bin/bash
     depends_on:
       - postgres
@@ -114,11 +110,7 @@ services:
       - "traefik.enable=false"
 
   api:
-<<<<<<< HEAD
-    image: alephdata/aleph:${ALEPH_TAG:-3.12.2}
-=======
-    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.0}
->>>>>>> 5f1660221 (Update to the latest Aleph version)
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: gunicorn -w 6 -b 0.0.0.0:8000 --log-level debug --log-file - aleph.wsgi:app
     expose:
       - 8000
@@ -140,11 +132,7 @@ services:
       - "traefik.enable=false"
 
   ui:
-<<<<<<< HEAD
-    image: alephdata/aleph-ui-production:${ALEPH_TAG:-3.12.2}
-=======
-    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.0}
->>>>>>> 5f1660221 (Update to the latest Aleph version)
+    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1-rc7}
     depends_on:
       - api
       - traefik

diff --git a/contrib/keycloak/docker-compose.dev-keycloak.yml b/contrib/keycloak/docker-compose.dev-keycloak.yml
@@ -16,7 +16,7 @@ services:
   elasticsearch:
     build:
       context: services/elasticsearch
-    image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.14.0}
+    image: ghcr.io/alephdata/aleph-elasticsearch:${ALEPH_TAG:-3.14.1-rc7}
     hostname: elasticsearch
     environment:
       - discovery.type=single-node
@@ -64,7 +64,7 @@ services:
   app:
     build:
       context: .
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.0}
+    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     hostname: aleph
     command: /bin/bash
     links:
@@ -92,7 +92,7 @@ services:
   api:
     build:
       context: .
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.0}
+    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: aleph run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger
     ports:
       - "127.0.0.1:5000:5000"
@@ -126,7 +126,7 @@ services:
   ui:
     build:
       context: ui
-    image: alephdata/aleph-ui:${ALEPH_TAG:-3.14.0}
+    image: alephdata/aleph-ui:${ALEPH_TAG:-3.14.1-rc7}
     links:
       - api
     command: npm run start

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -82,7 +82,7 @@ services:
   app:
     build:
       context: .
-    image: alephdata/aleph:${ALEPH_TAG:-latest}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-latest}
     hostname: aleph
     command: /bin/bash
     depends_on:
@@ -110,7 +110,7 @@ services:
   api:
     build:
       context: .
-    image: alephdata/aleph:${ALEPH_TAG:-latest}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-latest}
     command: python3 -m debugpy --listen 0.0.0.0:5678 -m flask run -h 0.0.0.0 -p 5000 --with-threads --reload --debugger
     ports:
       - "127.0.0.1:5000:5000"
@@ -137,7 +137,7 @@ services:
   ui:
     build:
       context: ui
-    image: alephdata/aleph-ui:${ALEPH_TAG:-latest}
+    image: ghcr.io/alephdata/aleph-ui:${ALEPH_TAG:-latest}
     depends_on:
       - api
     command: "bash -c 'rsync --archive --inplace --no-compress --whole-file /node_modules /alephui && npm run start'"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   redis:
     image: redis:alpine
-    command: ["redis-server", "--save", "3600", "10"]
+    command: [ "redis-server", "--save", "3600", "10" ]
     volumes:
       - redis-data:/data
 
@@ -46,7 +46,7 @@ services:
       - aleph.env
 
   worker:
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: aleph worker
     restart: on-failure
     depends_on:
@@ -62,7 +62,7 @@ services:
       - aleph.env
 
   shell:
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: /bin/bash
     depends_on:
       - postgres
@@ -80,7 +80,7 @@ services:
       - aleph.env
 
   api:
-    image: alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
+    image: ghcr.io/alephdata/aleph:${ALEPH_TAG:-3.14.1-rc7}
     command: gunicorn -w 6 -b 0.0.0.0:8000 --timeout 3600 --log-level debug --log-file - aleph.wsgi:app
     expose:
       - 8000
@@ -98,7 +98,7 @@ services:
       - aleph.env
 
   ui:
-    image: alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1-rc7}
+    image: ghcr.io/alephdata/aleph-ui-production:${ALEPH_TAG:-3.14.1-rc7}
     depends_on:
       - api
     ports: