Use ghcr

Author: santiagolizardo

.github/workflows/build-deployment.yml

@@ -12,8 +12,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login to Quay
-        run: echo "${{ secrets.QUAY_ROBOT_TOKEN }}" | docker login -u "${{ secrets.QUAY_ROBOT_USERNAME }}" --password-stdin quay.io
+      - name: Login to container registry
+        run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u "${{ secrets.CR_USERNAME }}" --password-stdin
       - name: Build
         run: |
           cp config-template.json config.json
@@ -25,4 +25,4 @@ jobs:
       - name: Upload CC report
         run: bash <(curl -s https://codecov.io/bash) -f tests/clover.xml
       - name: Deploy
-        run: ./docker/push_image.sh
+        run: make build push

Makefile

@@ -12,7 +12,7 @@ DB_CONTAINER=rmap-mysql
 HOST_UID=$(shell id -u)
 HOST_GID=$(shell id -g)
 
-DOCKER_IMAGE_NAME = quay.io/reconmap/rest-api
+DOCKER_IMAGE_NAME = ghcr.io/reconmap/rest-api
 DOCKER_DEFAULT_TAG = $(DOCKER_IMAGE_NAME)
 
 ifndef GIT_BRANCH_NAME

compose.debug.yaml

@@ -1,8 +1,7 @@
 services:
-
   api:
     container_name: rmap-api
-    image: quay.io/reconmap/rest-api:latest
+    image: ghcr.io/reconmap/rest-api:latest
     build:
       context: ./
       dockerfile: docker/api/development.Dockerfile
@@ -34,4 +33,4 @@ services:
       PHP_IDE_CONFIG: ${PHP_IDE_CONFIG:-serverName=DOCKER_SERVER}
       XDEBUG_MODE: ${XDEBUG_MODE:-debug}
       XDEBUG_CONFIG: "client_host=host.docker.internal"
-      XDEBUG_TRIGGER: 'yes'
+      XDEBUG_TRIGGER: "yes"

compose.yaml

@@ -10,7 +10,7 @@ services:
 
   mysql:
     container_name: rmap-mysql
-    image: quay.io/reconmap/rest-api-db:latest
+    image: ghcr.io/reconmap/rest-api-db:latest
     build:
       context: ./
       dockerfile: docker/mysql/Dockerfile
@@ -30,7 +30,7 @@ services:
 
   keycloak:
     container_name: rmap-keycloak
-    image: quay.io/reconmap/keycloak-custom:latest
+    image: ghcr.io/reconmap/keycloak-custom:latest
     command: "start --hostname=http://localhost:8080 --proxy-headers xforwarded --http-enabled true --import-realm"
     environment:
       KEYCLOAK_ADMIN: admin
@@ -50,7 +50,11 @@ services:
     ports:
       - "8080:8080"
     healthcheck:
-      test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/9000;echo -e 'GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n' >&3;if [ $? -eq 0 ]; then echo 'Healthcheck Successful';exit 0;else echo 'Healthcheck Failed';exit 1;fi;"]
+      test:
+        [
+          "CMD-SHELL",
+          "exec 3<>/dev/tcp/127.0.0.1/9000;echo -e 'GET /health/ready HTTP/1.1\r\nhost: http://localhost\r\nConnection: close\r\n\r\n' >&3;if [ $? -eq 0 ]; then echo 'Healthcheck Successful';exit 0;else echo 'Healthcheck Failed';exit 1;fi;",
+        ]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -60,7 +64,7 @@ services:
 
   api:
     container_name: rmap-api
-    image: quay.io/reconmap/rest-api:latest
+    image: ghcr.io/reconmap/rest-api:latest
     build:
       context: ./
       dockerfile: docker/api/Dockerfile
@@ -94,7 +98,7 @@ services:
 
   agent:
     container_name: rmap-agent
-    image: quay.io/reconmap/agent:latest
+    image: ghcr.io/reconmap/agent:latest
     ports:
       - "5520:5520"
     environment:

docker/api/Dockerfile

@@ -1,5 +1,9 @@
 FROM debian:bookworm-slim
 
+LABEL org.opencontainers.image.source=https://github.com/reconmap/reconmap
+LABEL org.opencontainers.image.description="reconmap/rest-api"
+LABEL org.opencontainers.image.licenses="Apache-2.0"
+
 ARG PHP_VERSION=8.4
 ARG DEBIAN_FRONTEND=noninteractive
 

docker/api/development.Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/reconmap/rest-api:latest
+FROM ghcr.io/reconmap/rest-api:latest
 
 RUN groupadd -g ${HOST_GID} reconmappers && \
     useradd -u ${HOST_UID} -g ${HOST_GID} -m -s /bin/bash reconmapper

docker/mysql/Dockerfile

@@ -7,6 +7,8 @@ LABEL maintainer="Reconmap engineering" \
     org.opencontainers.image.documentation="https://docs.reconmap.com" \
     org.opencontainers.image.licenses="GPL" \
     org.opencontainers.image.url="https://github.com/reconmap/rest-api"
+LABEL org.opencontainers.image.source=https://github.com/reconmap/reconmap
+LABEL org.opencontainers.image.description="reconmap/rest-api-db"
 
 ARG HOST_UID
 ARG HOST_GID