Compare commits

..

1 Commits

Author SHA1 Message Date
Tom Alexander
87100d093e Add support for building the site via nix.
Some checks failed
build-staging Build build-staging has failed
2026-07-13 20:39:16 -04:00
4 changed files with 19 additions and 8 deletions

View File

@@ -142,6 +142,8 @@ 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
@@ -155,6 +157,8 @@ spec:
workspace: git-source
- name: dockerconfig
workspace: docker-credentials
- name: nix-cache-creds
workspace: nix-cache-creds
runAfter:
- fetch-repository
finally:
@@ -219,6 +223,7 @@ spec:
workspaces:
- name: git-source
- name: docker-credentials
- name: nix-cache-creds
workspaces:
- name: git-source
volumeClaimTemplate:
@@ -233,6 +238,9 @@ 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"

View File

@@ -10,6 +10,8 @@ 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

View File

@@ -84,18 +84,12 @@
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;

View File

@@ -1,9 +1,9 @@
{
hello,
lib,
pkgs,
natter,
organic_ast_explorer,
homepage_private,
}:
let
@@ -14,12 +14,19 @@ 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
'';