Standardize Docker CI to use ghcr

.github/workflows/cd-workflow.yml

@@ -1,4 +1,4 @@
-name: Continuous Deployment to Staging
+name: Continuous Deployment of Master
 
 on:
   push:
@@ -9,9 +9,7 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     with:
       push: true
-      tags: dticarriage/carriage-service:latest
-      registry: docker.io
-    secrets:
-      inherit: true
-      username: ${{ secrets.DOCKERHUB_USERNAME }}
-      password: ${{ secrets.DOCKERHUB_TOKEN }}
+      tags: |
+        ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:latest
+        ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:${{ github.sha }}
+    secrets: inherit

.github/workflows/ci-container.yml

@@ -4,22 +4,14 @@ on: pull_request
 
 jobs:
   build:
-    permissions:
-      contents: read
-      packages: write
-
     uses: ./.github/workflows/docker-build-push.yml
     with:
       push: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
       tags: |
-        ghcr.io/${{ github.repository }}/pr-${{ github.event.pull_request.number }}:latest
-        ghcr.io/${{ github.repository }}/pr-${{ github.event.pull_request.number }}:${{ github.sha }}
+        ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:pr-${{ github.event.pull_request.number }}-latest
+        ghcr.io/${{ github.repository_owner }}/${{ github.repository }}:pr-${{ github.event.pull_request.number }}-${{ github.sha }}
       labels: |
         org.opencontainers.image.source=${{ github.event.pull_request.html_url }}
         org.opencontainers.image.title=PR-${{ github.event.pull_request.number }}
         org.opencontainers.image.description=${{ github.event.pull_request.title }}
-      registry: ghcr.io
-    secrets:
-      inherit: true
-      username: ${{ secrets.DOCKERHUB_USERNAME }}
-      password: ${{ secrets.DOCKERHUB_TOKEN }}
+    secrets: inherit

.github/workflows/docker-build-push.yml

@@ -1,4 +1,5 @@
 name: Docker Build and Push
+# must be run with `secrets: inherit` to ensure secrets are given
 
 on:
   workflow_call:
@@ -16,17 +17,10 @@ on:
         required: false
         default: ''
         type: string
-      registry:
-        description: 'Registry URL (optional)'
-        required: false
-        type: string
-    secrets:
-      username:
-        description: 'Registry password (optional)'
-        required: false
-      password:
-        description: 'Registry password (optional)'
-        required: false
+
+permissions:
+  contents: write
+  packages: write
 
 jobs:
   build:
@@ -42,9 +36,9 @@ jobs:
       - name: Log in to registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ inputs.registry }}
-          username: ${{ inputs.username }}
-          password: ${{ inputs.password }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6

docker-compose.yml

@@ -28,5 +28,5 @@ services:
         - REACT_APP_ENCRYPTION_KEY=${REACT_APP_ENCRYPTION_KEY}
     ports:
       - '3001:3001'
-    image: dticarriage/carriage-service:latest
+    image: ghcr.io/cornell-dti/carriage-web:${IMAGE_TAG:-latest}
     restart: always