From ae03067ffa5bcc0ff06cb04a32b69d7dcd4da674 Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Sun, 18 Jun 2023 21:23:42 +0530
Subject: [PATCH 1/2] Update to use ghcr images

---
 .github/workflows/test.yaml |  6 ++++++
 justfile                    | 12 ++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2f30587..29eb5cc 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -18,6 +18,12 @@ jobs:
       - uses: extractions/setup-just@v1
         with:
           just-version: 1.8.0
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - uses: cachix/install-nix-action@v19
         with:
           nix_path: nixpkgs=channel:nixos-unstable
diff --git a/justfile b/justfile
index e8e2ad4..b3cfc32 100644
--- a/justfile
+++ b/justfile
@@ -6,11 +6,11 @@ default:
 
 # Build docker image
 build-image:
-    docker image build . -f Dockerfile -t fpco/alpine-haskell-stack:{{GHC_VERSION}}
+    docker image build . -f Dockerfile -t ghcr.io/fpco/alpine-haskell-stack:{{GHC_VERSION}}
 
 # Push image
 push-image:
-    docker push fpco/alpine-haskell-stack:{{GHC_VERSION}}
+    docker push ghcr.io/fpco/alpine-haskell-stack:{{GHC_VERSION}}
 
 # Build nix image
 build-nix-image:
@@ -20,11 +20,7 @@ build-nix-image:
 load-nix-image:
     docker load < result
 
-# Docker login
-docker-login:
-    amber exec -- docker login --username psibi --password $DOCKER_PASSWORD
-
 # Test image
 test-image:
-    docker run --rm --tty fpco/alpine-haskell-stack:{{GHC_VERSION}} ghc --version
-    docker run --rm --tty fpco/alpine-haskell-stack:{{GHC_VERSION}} stack --version
+    docker run --rm --tty ghcr.io/fpco/alpine-haskell-stack:{{GHC_VERSION}} ghc --version
+    docker run --rm --tty ghcr.io/fpco/alpine-haskell-stack:{{GHC_VERSION}} stack --version

From 8e3db8c10f1b93d52c14ea358aae62eac73f0adf Mon Sep 17 00:00:00 2001
From: Sibi Prabakaran <sibi@psibi.in>
Date: Sun, 18 Jun 2023 23:17:29 +0530
Subject: [PATCH 2/2] Remove docker-login

---
 .github/workflows/test.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 29eb5cc..69457d6 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -42,5 +42,4 @@ jobs:
         shell: bash
         run: |
           set -exuo pipefail
-          just docker-login
           just push-image