chore: rename solidhaus → kammer
Some checks failed
Build and Push OCI Image / build (push) Failing after 13s
Some checks failed
Build and Push OCI Image / build (push) Failing after 13s
- Update flake outputs: solidhaus-image → kammer-image - Update registry references: registry.toph.so/solidhaus → registry.toph.so/kammer - Update workflow to build and push kammer image - Update package names and metadata Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
a04672b4d0
commit
34847cad58
3 changed files with 19 additions and 18 deletions
|
|
@ -17,11 +17,11 @@ jobs:
|
||||||
- name: Build OCI image
|
- name: Build OCI image
|
||||||
run: |
|
run: |
|
||||||
# Try with cache first, fall back to building from source
|
# Try with cache first, fall back to building from source
|
||||||
nix build .#solidhaus-image \
|
nix build .#kammer-image \
|
||||||
--print-build-logs \
|
--print-build-logs \
|
||||||
--show-trace || {
|
--show-trace || {
|
||||||
echo "Build failed, retrying with --no-substitute to build from source..."
|
echo "Build failed, retrying with --no-substitute to build from source..."
|
||||||
nix build .#solidhaus-image \
|
nix build .#kammer-image \
|
||||||
--print-build-logs \
|
--print-build-logs \
|
||||||
--show-trace \
|
--show-trace \
|
||||||
--option substitute false
|
--option substitute false
|
||||||
|
|
@ -33,25 +33,25 @@ jobs:
|
||||||
# Ensure temp directory exists for skopeo
|
# Ensure temp directory exists for skopeo
|
||||||
mkdir -p /var/tmp /tmp
|
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 \
|
skopeo copy \
|
||||||
--dest-tls-verify=false \
|
--dest-tls-verify=false \
|
||||||
--tmpdir /tmp \
|
--tmpdir /tmp \
|
||||||
"docker-archive:$image" \
|
"docker-archive:$image" \
|
||||||
"docker://registry.toph.so/solidhaus:latest"
|
"docker://registry.toph.so/kammer:latest"
|
||||||
|
|
||||||
# Also tag with commit SHA
|
# Also tag with commit SHA
|
||||||
skopeo copy \
|
skopeo copy \
|
||||||
--dest-tls-verify=false \
|
--dest-tls-verify=false \
|
||||||
--tmpdir /tmp \
|
--tmpdir /tmp \
|
||||||
"docker-archive:$image" \
|
"docker-archive:$image" \
|
||||||
"docker://registry.toph.so/solidhaus:${GITHUB_SHA:0:7}"
|
"docker://registry.toph.so/kammer:${GITHUB_SHA:0:7}"
|
||||||
|
|
||||||
- name: Build summary
|
- name: Build summary
|
||||||
if: github.ref == 'refs/heads/main'
|
if: github.ref == 'refs/heads/main'
|
||||||
run: |
|
run: |
|
||||||
echo "### ✅ Image Built and Pushed" >> $GITHUB_STEP_SUMMARY
|
echo "### ✅ Image Built and Pushed" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "" >> $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 "- **Tag**: ${GITHUB_SHA:0:7}" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "- **Commit**: ${GITHUB_SHA}" >> $GITHUB_STEP_SUMMARY
|
echo "- **Commit**: ${GITHUB_SHA}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
|
|
||||||
24
flake.nix
24
flake.nix
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
description = "SolidHaus — Local-first household inventory app";
|
description = "Kammer — Local-first household inventory app";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
|
@ -29,8 +29,8 @@
|
||||||
in {
|
in {
|
||||||
packages = {
|
packages = {
|
||||||
# Build the SvelteKit app
|
# Build the SvelteKit app
|
||||||
solidhaus = buildNpmPackage {
|
kammer = buildNpmPackage {
|
||||||
pname = "solidhaus";
|
pname = "kammer";
|
||||||
version = "0.0.1";
|
version = "0.0.1";
|
||||||
|
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
@ -48,13 +48,13 @@
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Local-first household inventory app with barcode scanning";
|
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
|
# OCI image with nginx serving the built app
|
||||||
solidhaus-image = pkgs.dockerTools.buildLayeredImage {
|
kammer-image = pkgs.dockerTools.buildLayeredImage {
|
||||||
name = "registry.toph.so/solidhaus";
|
name = "registry.toph.so/kammer";
|
||||||
tag = "latest";
|
tag = "latest";
|
||||||
|
|
||||||
contents = with pkgs; [
|
contents = with pkgs; [
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
|
|
||||||
# Copy built app
|
# Copy built app
|
||||||
mkdir -p usr/share/nginx/html
|
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
|
# Create nginx config
|
||||||
cat > etc/nginx/nginx.conf <<'EOF'
|
cat > etc/nginx/nginx.conf <<'EOF'
|
||||||
|
|
@ -147,22 +147,22 @@
|
||||||
devPort = 5173; # Vite default port
|
devPort = 5173; # Vite default port
|
||||||
};
|
};
|
||||||
|
|
||||||
default = config.packages.solidhaus;
|
default = config.packages.kammer;
|
||||||
};
|
};
|
||||||
|
|
||||||
apps = {
|
apps = {
|
||||||
# Push image to registry
|
# Push image to registry
|
||||||
push-solidhaus-image = {
|
push-kammer-image = {
|
||||||
type = "app";
|
type = "app";
|
||||||
program = pkgs.lib.getExe (pkgs.writeShellApplication {
|
program = pkgs.lib.getExe (pkgs.writeShellApplication {
|
||||||
name = "push-solidhaus-image";
|
name = "push-kammer-image";
|
||||||
runtimeInputs = [pkgs.skopeo];
|
runtimeInputs = [pkgs.skopeo];
|
||||||
text = ''
|
text = ''
|
||||||
image=$(nix build --no-link --print-out-paths .#solidhaus-image)
|
image=$(nix build --no-link --print-out-paths .#kammer-image)
|
||||||
skopeo copy \
|
skopeo copy \
|
||||||
--insecure-policy \
|
--insecure-policy \
|
||||||
"docker-archive:$image" \
|
"docker-archive:$image" \
|
||||||
"docker://registry.toph.so/solidhaus:latest"
|
"docker://registry.toph.so/kammer:latest"
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
1
result
Symbolic link
1
result
Symbolic link
|
|
@ -0,0 +1 @@
|
||||||
|
/nix/store/3dna41ydmr1ia5fiicgzf19p1z68l10v-solidhaus.tar.gz
|
||||||
Loading…
Add table
Reference in a new issue