Merge pull request #33 from juhp/ghcr.io

switch from old docker.pkg.github.com registry to ghcr.io
commercialhaskell · Sep 18, 2023 · 888ea72 · 888ea72
2 parents 1382cdc + cd0a7b9
commit 888ea72
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/Dockerfile.runtime b/.github/workflows/Dockerfile.runtime
@@ -1,10 +1,10 @@
-FROM docker.pkg.github.com/commercialhaskell/curator/base-build:9538a9167251c0b06557b685d9fab6dc91b577bb as build-app
+FROM ghcr.io/commercialhaskell/curator/base-build:9538a9167251c0b06557b685d9fab6dc91b577bb as build-app
 
 RUN mkdir -p /artifacts/bin
 COPY . /src
 RUN stack install --stack-yaml /src/stack.yaml --local-bin-path /artifacts/bin
 
-FROM docker.pkg.github.com/commercialhaskell/curator/base-run:9538a9167251c0b06557b685d9fab6dc91b577bb
+FROM ghcr.io/commercialhaskell/curator/base-run:9538a9167251c0b06557b685d9fab6dc91b577bb
 
 RUN mkdir -p /app/db
 COPY --from=build-app /artifacts/bin/casa-curator /usr/local/bin/casa-curator

diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -13,18 +13,18 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Log into Github registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build base run image
         run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/base-run:$GITHUB_SHA
+          IMAGE_ID=ghcr.io/${{ github.repository }}/base-run:$GITHUB_SHA
           docker build . -f .github/workflows/Dockerfile.base-run --tag $IMAGE_ID
           docker push $IMAGE_ID
           echo Pushed new base image $IMAGE_ID
 
       - name: Build base build image
         run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/base-build:$GITHUB_SHA
+          IMAGE_ID=ghcr.io/${{ github.repository }}/base-build:$GITHUB_SHA
           docker build . -f .github/workflows/Dockerfile.base-build --tag $IMAGE_ID
           docker push $IMAGE_ID
           echo Pushed new base build image $IMAGE_ID
diff --git a/.github/workflows/runtime.yml b/.github/workflows/runtime.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Log into Github registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Build image
         run: docker build . -f .github/workflows/Dockerfile.runtime --tag image