Include homepage_private static files.

There is no way to include them when fetching from a substituter.

.webhook_bridge/pipeline-build-homepage-staging.yaml

@@ -142,8 +142,6 @@ spec:
               - "type=registry,ref=$(params.image-name):buildcache,mode=max,compression=zstd,compression-level=22,rewrite-timestamp=true,image-manifest=true,oci-mediatypes=true"
               - --opt
               - build-arg:SOURCE_DATE_EPOCH=$(tasks.get-git-commit-time.results.unix-time)
-              - --secret
-              - id=cache_token,src=/workspace/nix-cache-creds/CACHE_GET_TOKEN
           - name: BUILDKITD_TOML
             value: |
               debug = true
@@ -157,8 +155,6 @@ spec:
             workspace: git-source
           - name: dockerconfig
             workspace: docker-credentials
-          - name: nix-cache-creds
-            workspace: nix-cache-creds
         runAfter:
           - fetch-repository
     finally:
@@ -223,7 +219,6 @@ spec:
     workspaces:
       - name: git-source
       - name: docker-credentials
-      - name: nix-cache-creds
   workspaces:
     - name: git-source
       volumeClaimTemplate:
@@ -238,9 +233,6 @@ spec:
     - name: docker-credentials
       secret:
         secretName: harbor-plain
-    - name: nix-cache-creds
-      secret:
-        secretName: nix-pull-through-cache
   params:
     - name: image-name
       value: "harbor.fizz.buzz/private/homepage-staging"

docker/server/Dockerfile

@@ -10,8 +10,6 @@ filter-syscalls = false
 substituters = http://ncps.nix-pull-through-cache.svc.cluster.local:80 https://cache.nixos.org
 EOF
 
-# RUN --mount=type=secret,id=cache_token echo "extra-access-tokens = ncps.nix-pull-through-cache.svc.cluster.local=PAT:$(cat /run/secrets/cache_token)" >> /etc/nix/nix.conf
-
 RUN cp "$(nix build nixpkgs#cacert --print-out-paths)/etc/ssl/certs/ca-bundle.crt" /tmp/ca-bundle.crt
 
 COPY . /tmp/build

flake.nix

@@ -84,12 +84,18 @@
         homepage = final.lib.makeScope final.newScope (
           homepageScope:
           let
+            homepage_private = fetchGit {
+              url = "git@code.fizz.buzz:talexander/homepage_private.git";
+              ref = "main";
+              rev = "89ba9628bf3e596345bc83f59cef5a2943584894";
+            };
             natter' = (natter.overlays.default final final).natter.release;
             organic_ast_explorer' =
               (organic_ast_explorer.overlays.default final final).organic_ast_explorer.release;
             release = homepageScope.callPackage ./nix/package.nix {
               natter = natter';
               organic_ast_explorer = organic_ast_explorer';
+              inherit homepage_private;
             };
             nginx_conf = final.replaceVars "${./docker/server/nginx.conf}" {
               web_root = release;

nix/package.nix

@@ -1,9 +1,9 @@
 {
-  hello,
   lib,
   pkgs,
   natter,
   organic_ast_explorer,
+  homepage_private,
 }:
 let
 
@@ -14,19 +14,12 @@ pkgs.stdenv.mkDerivation rec {
 
   src = lib.cleanSource ../.;
 
-  nativeBuildInputs = [
-    # pkgs.simgrid
-    # pkgs.boost
-    # pkgs.cmake
-  ];
-
   configurePhase = "";
 
-  # TODO copy COPY --link --from=private /homepage_private/static /source/static/
-
   buildPhase = ''
     mkdir -p static/organic/ast_explorer
     cp ${organic_ast_explorer}/* static/organic/ast_explorer/
+    cp -r ${homepage_private}/static/* static/
 
     ${natter}/bin/natter build --config natter.toml
   '';