Merge branch 'buildah'

.webhook_bridge/pipeline-build-homepage.yaml

@@ -70,7 +70,6 @@ spec:
               script: |
                 #!/usr/bin/env sh
                 set -euo pipefail
-                export GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=accept-new"
                 git fetch --tags
                 current_tag=$(git tag --points-at HEAD --list 'v*.*.*')
                 if [ -z "$current_tag" ]; then

docker/server/Dockerfile

@@ -15,12 +15,8 @@ EOF
 
 RUN cp "$(nix build nixpkgs#cacert --print-out-paths)/etc/ssl/certs/ca-bundle.crt" /tmp/ca-bundle.crt
 
-COPY flake.nix flake.lock /tmp/build
-WORKDIR /tmp/build
-
-RUN --mount=type=ssh GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" nix build --no-link '.#dependencies'
-
 COPY . /tmp/build
+WORKDIR /tmp/build
 
 RUN --mount=type=ssh GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" nix build '.#docker_env'
 

flake.lock

@@ -8,11 +8,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1792617478,
-        "narHash": "sha256-ctFfFI7qlZxv6s8nznps7KYp/QQ1zzbMKCgLtl7YYRA=",
+        "lastModified": 1784333070,
+        "narHash": "sha256-3WkxaHOS13vFBtQFBmGIPScQZDNLk5bqCAY9qBJASl0=",
         "ref": "refs/heads/main",
-        "rev": "1c369e4b25caf4dd9a962340a770fbd6e543820a",
-        "revCount": 331,
+        "rev": "faf279292ad20783775d909b96815f7ca2843b85",
+        "revCount": 327,
         "type": "git",
         "url": "https://code.fizz.buzz/talexander/natter.git"
       },

flake.nix

@@ -74,11 +74,6 @@
           inherit (appliedOverlay.homepage)
             release
             ;
-          dependencies = pkgs.symlinkJoin {
-            # This is to enable the docker image to install all the dependencies, cache that layer, and then build the final site after the org source files have been loaded. Without this, every update to the blog posts would result in recompiling everything.
-            name = "homepage-dependencies";
-            paths = appliedOverlay.homepage.dependencies;
-          };
           docker_env = pkgs.stdenv.mkDerivation {
             pname = "homepage-docker-env";
             version = "0.0.0";
@@ -105,16 +100,14 @@
             natter' = (natter.overlays.default final final).natter.release;
             organic_ast_explorer' =
               (organic_ast_explorer.overlays.default final final).organic_ast_explorer.release;
-            dependencies = {
+            release = homepageScope.callPackage ./nix/package.nix {
               natter = natter';
               organic_ast_explorer = organic_ast_explorer';
               inherit homepage_private;
             };
-            release = homepageScope.callPackage ./nix/package.nix dependencies;
           in
           {
             inherit release;
-            dependencies = (builtins.attrValues dependencies);
           }
         );
       };