From 4dc4de80cbd1856d587d39724da9fa5858a2c351 Mon Sep 17 00:00:00 2001 From: Sietse Snel Date: Fri, 13 Dec 2024 15:49:30 +0100 Subject: [PATCH] Update docker image names to use GHCR --- docker/docker-compose-separate-msl-api.yml | 10 +++++----- docker/docker-compose.yml | 8 ++++---- docker/images/ckan/build.sh | 2 +- docker/images/msl-api/build.sh | 2 +- docker/images/nginx/build.sh | 2 +- docker/images/solr/build.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/docker-compose-separate-msl-api.yml b/docker/docker-compose-separate-msl-api.yml index c89be64..8d4b4d5 100644 --- a/docker/docker-compose-separate-msl-api.yml +++ b/docker/docker-compose-separate-msl-api.yml @@ -20,7 +20,7 @@ volumes: services: ckan: container_name: ckan - image: epos-msl-ckan:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-ckan:latest links: - db - solr @@ -45,7 +45,7 @@ services: nginx: container_name: nginx - image: epos-msl-nginx:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-nginx:latest environment: - EPOS_MSL_HOST=${EPOS_MSL_HOST} ports: @@ -73,7 +73,7 @@ services: mslapi_webserver: container_name: mslapi_web - image: epos-msl-api:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-mslapi:latest environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MSLAPI_ROLE=WEBSERVER @@ -83,7 +83,7 @@ services: mslapi_worker: container_name: mslapi_worker - image: epos-msl-api:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-mslapi:latest environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MSLAPI_ROLE=QUEUE_WORKER @@ -93,7 +93,7 @@ services: solr: container_name: solr - image: epos-msl-solr:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-solr:latest volumes: - solr_data:/opt/solr/server/solr/ckan/data diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4de07d6..50ebd5e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -20,7 +20,7 @@ volumes: services: ckan: container_name: ckan - image: epos-msl-ckan:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-ckan:latest links: - db - solr @@ -45,7 +45,7 @@ services: nginx: container_name: nginx - image: epos-msl-nginx:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-nginx:latest environment: - EPOS_MSL_HOST=${EPOS_MSL_HOST} ports: @@ -75,7 +75,7 @@ services: # the MSL-API web application and the queue worker. mslapi_webserver: container_name: mslapi_web - image: epos-msl-api:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-mslapi:latest environment: - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MSLAPI_ROLE=BOTH @@ -85,7 +85,7 @@ services: solr: container_name: solr - image: epos-msl-solr:latest + image: ghcr.io/utrechtuniversity/epos-msl-cat-solr:latest volumes: - solr_data:/opt/solr/server/solr/ckan/data diff --git a/docker/images/ckan/build.sh b/docker/images/ckan/build.sh index 9712778..3e8e52e 100755 --- a/docker/images/ckan/build.sh +++ b/docker/images/ckan/build.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker build -t epos-msl-ckan:latest . +docker build -t ghcr.io/utrechtuniversity/epos-msl-cat-ckan:latest . diff --git a/docker/images/msl-api/build.sh b/docker/images/msl-api/build.sh index 0485a35..6513f0a 100755 --- a/docker/images/msl-api/build.sh +++ b/docker/images/msl-api/build.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker build -t epos-msl-api:latest . +docker build -t ghcr.io/utrechtuniversity/epos-msl-cat-mslapi:latest . diff --git a/docker/images/nginx/build.sh b/docker/images/nginx/build.sh index 4c015cc..26bf838 100755 --- a/docker/images/nginx/build.sh +++ b/docker/images/nginx/build.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker build -t epos-msl-nginx:latest . +docker build -t ghcr.io/utrechtuniversity/epos-msl-cat-nginx:latest . diff --git a/docker/images/solr/build.sh b/docker/images/solr/build.sh index 957e4cd..4fd5fd3 100755 --- a/docker/images/solr/build.sh +++ b/docker/images/solr/build.sh @@ -1,2 +1,2 @@ #!/bin/sh -docker build -t epos-msl-solr:latest . +docker build -t ghcr.io/utrechtuniversity/epos-msl-cat-solr:latest .