diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml index d9b6b94..3ff9d98 100644 --- a/.forgejo/workflows/build-image.yml +++ b/.forgejo/workflows/build-image.yml @@ -17,11 +17,11 @@ jobs: - name: Build OCI image run: | # Try with cache first, fall back to building from source - nix build .#solidhaus-image \ + nix build .#kammer-image \ --print-build-logs \ --show-trace || { echo "Build failed, retrying with --no-substitute to build from source..." - nix build .#solidhaus-image \ + nix build .#kammer-image \ --print-build-logs \ --show-trace \ --option substitute false @@ -33,25 +33,25 @@ jobs: # Ensure temp directory exists for skopeo mkdir -p /var/tmp /tmp - image=$(nix build --no-link --print-out-paths .#solidhaus-image) + image=$(nix build --no-link --print-out-paths .#kammer-image) skopeo copy \ --dest-tls-verify=false \ --tmpdir /tmp \ "docker-archive:$image" \ - "docker://registry.toph.so/solidhaus:latest" + "docker://registry.toph.so/kammer:latest" # Also tag with commit SHA skopeo copy \ --dest-tls-verify=false \ --tmpdir /tmp \ "docker-archive:$image" \ - "docker://registry.toph.so/solidhaus:${GITHUB_SHA:0:7}" + "docker://registry.toph.so/kammer:${GITHUB_SHA:0:7}" - name: Build summary if: github.ref == 'refs/heads/main' run: | echo "### ✅ Image Built and Pushed" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - echo "- **Image**: registry.toph.so/solidhaus:latest" >> $GITHUB_STEP_SUMMARY + echo "- **Image**: registry.toph.so/kammer:latest" >> $GITHUB_STEP_SUMMARY echo "- **Tag**: ${GITHUB_SHA:0:7}" >> $GITHUB_STEP_SUMMARY echo "- **Commit**: ${GITHUB_SHA}" >> $GITHUB_STEP_SUMMARY diff --git a/flake.nix b/flake.nix index d1406af..9b894d9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "SolidHaus — Local-first household inventory app"; + description = "Kammer — Local-first household inventory app"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -29,8 +29,8 @@ in { packages = { # Build the SvelteKit app - solidhaus = buildNpmPackage { - pname = "solidhaus"; + kammer = buildNpmPackage { + pname = "kammer"; version = "0.0.1"; src = ./.; @@ -48,13 +48,13 @@ meta = { description = "Local-first household inventory app with barcode scanning"; - homepage = "https://git.toph.so/toph/solidhaus"; + homepage = "https://git.toph.so/toph/kammer"; }; }; # OCI image with nginx serving the built app - solidhaus-image = pkgs.dockerTools.buildLayeredImage { - name = "registry.toph.so/solidhaus"; + kammer-image = pkgs.dockerTools.buildLayeredImage { + name = "registry.toph.so/kammer"; tag = "latest"; contents = with pkgs; [ @@ -85,7 +85,7 @@ # Copy built app mkdir -p usr/share/nginx/html - cp -r ${config.packages.solidhaus}/* usr/share/nginx/html/ + cp -r ${config.packages.kammer}/* usr/share/nginx/html/ # Create nginx config cat > etc/nginx/nginx.conf <<'EOF' @@ -147,22 +147,22 @@ devPort = 5173; # Vite default port }; - default = config.packages.solidhaus; + default = config.packages.kammer; }; apps = { # Push image to registry - push-solidhaus-image = { + push-kammer-image = { type = "app"; program = pkgs.lib.getExe (pkgs.writeShellApplication { - name = "push-solidhaus-image"; + name = "push-kammer-image"; runtimeInputs = [pkgs.skopeo]; text = '' - image=$(nix build --no-link --print-out-paths .#solidhaus-image) + image=$(nix build --no-link --print-out-paths .#kammer-image) skopeo copy \ --insecure-policy \ "docker-archive:$image" \ - "docker://registry.toph.so/solidhaus:latest" + "docker://registry.toph.so/kammer:latest" ''; }); }; diff --git a/result b/result new file mode 120000 index 0000000..ab96f74 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/3dna41ydmr1ia5fiicgzf19p1z68l10v-solidhaus.tar.gz \ No newline at end of file