Merge pull request #435 from Kegbot/mikey/ghcr

docker: switch releases to ghcr.io
Kegbot · Jul 24, 2022 · 2067adf · 2067adf
2 parents c6b54ee + b3fd35f
commit 2067adf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,7 +2,7 @@
 .github/
 build/
 *.egg-info
-docs/build/
+docs/
 dist/
 kegbot-data/
 staticfiles/

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -2,6 +2,7 @@ name: Docker Build
 
 env:
   IMAGE_NAME: kegbot/server
+  REGISTRY: ghcr.io
 
 on:
   push:
@@ -33,7 +34,6 @@ jobs:
           else
             echo ::set-output name=version::snapshot
           fi
-          echo ::set-output name=build_archs::linux/amd64
           echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 
       # Work around an armv7 -> qemu bug caused during rust compilation. Yeah.. See repo.
@@ -67,7 +67,7 @@ jobs:
         id: docker_meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=raw,value=dev
             type=raw,value=latest,enable={{is_default_branch}}
@@ -83,6 +83,7 @@ jobs:
           cache-to: type=gha,mode=max
           push: false
           tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BUILD_DATE=${{ steps.prepare.outputs.build_date }}
             GIT_SHORT_SHA=${GITHUB_SHA::8}
@@ -92,20 +93,24 @@ jobs:
             linux/arm64
             linux/arm/v7
 
-      -
-        name: Login to registry
-        if: ${{ '${{ secrets.DOCKER_HUB_PASSWORD }}' != '' && '${{ secrets.DOCKER_HUB_USERNAME }}' != '' }}
-        run: echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
+      - name: Log in to container registry
+        if: ${{ '${{ secrets.GITHUB_TOKEN }}' != '' }}
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push to registry
-        if: ${{ '${{ secrets.DOCKER_HUB_PASSWORD }}' != '' && '${{ secrets.DOCKER_HUB_USERNAME }}' != '' }}
+      - name: Build and push to container registry
+        if: ${{ '${{ secrets.GITHUB_TOKEN }}' != '' }}
         uses: docker/build-push-action@v3
         with:
           context: .
           cache-from: type=gha
           cache-to: type=gha,mode=max
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BUILD_DATE=${{ steps.prepare.outputs.build_date }}
             GIT_SHORT_SHA=${GITHUB_SHA::8}

diff --git a/docs/source/docker-compose.example.yml b/docs/source/docker-compose.example.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   kegbot:
-    image: kegbot/server:stable
+    image: ghcr.io/kegbot/server:stable
     restart: unless-stopped
     command: run_server
     ports:
@@ -19,7 +19,7 @@ services:
       KEGBOT_SECRET_KEY: "changeme"
 
   workers:
-    image: kegbot/server:stable
+    image: ghcr.io/kegbot/server:stable
     restart: unless-stopped
     command: run_workers
     volumes: