From 687d16c49ea7936068bac64ec68c480a9d681962 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sun, 28 Apr 2024 20:17:08 +0200
Subject: [PATCH] Replace Docker with Skopeo

---
 .forgejo/workflows/cache.yaml |  3 ++-
 forgejo-nix-action.nix        | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.forgejo/workflows/cache.yaml b/.forgejo/workflows/cache.yaml
index f0f2526..85776e4 100644
--- a/.forgejo/workflows/cache.yaml
+++ b/.forgejo/workflows/cache.yaml
@@ -12,7 +12,8 @@ jobs:
           /bin/attic login local https://attic.kun.is ${{ secrets.ATTIC_TOKEN }}
           /bin/attic use home
       - name: Log into container registry
-        run: echo -n "${{ secrets.RUNNER_TOKEN }}" | /bin/docker login https://git.kun.is --username pim --password-stdin
+        # run: echo -n "${{ secrets.RUNNER_TOKEN }}" | /bin/docker login https://git.kun.is --username pim --password-stdin
+        run: /bin/docker login -u pim -p ${{ secrets.RUNNER_TOKEN }} https://git.kun.is
       - name: Build Pim's blog
         run: nix build --extra-experimental-features nix-command --extra-experimental-features flakes --out-link blog-pim ./checkout#packages.x86_64-linux.blog-pim
       - name: Push Pim's blog to Nix cache
diff --git a/forgejo-nix-action.nix b/forgejo-nix-action.nix
index 0c09cdc..dbbd00e 100644
--- a/forgejo-nix-action.nix
+++ b/forgejo-nix-action.nix
@@ -20,7 +20,9 @@ let
   nixConfDrv = pkgs.stdenv.mkDerivation {
     name = "nix.conf";
     dontUnpack = true;
-    installPhase = "install -Dm755 ${nixConf} $out/etc/nix/nix.conf";
+    installPhase = ''
+      install -Dm755 ${nixConf} $out/etc/nix/nix.conf
+    '';
   };
 in
 {
@@ -31,14 +33,9 @@ in
 
     copyToRoot = pkgs.buildEnv {
       name = "image-root";
-      paths = with pkgs; [ coreutils attic-client docker-client nixConfDrv ];
-      pathsToLink = [ "/bin" "/etc/nix" ];
+      # TODO: Maybe we don't even want these binaries in the base image, but run everything through nix-run?
+      paths = with pkgs; [ coreutils attic-client skopeo nixConfDrv ];
+      pathsToLink = [ "/bin" "/etc" ];
     };
-
-    # config = {
-    #   Env = [
-    #     "PATH=/bin:/root/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin"
-    #   ];
-    # };
   };
 })