From 9d069a14576feafe6af257c92d8cb65b2887cc88 Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Fri, 15 May 2026 06:22:05 -0700 Subject: [PATCH 1/3] C1: bump shower to v1.1.2 (probe FOD hash) Co-Authored-By: Claude Opus 4.7 (1M context) --- containers/shower/default.nix | 8 ++++---- docs/changelog.d/shower-v1.1.2.infra.md | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 docs/changelog.d/shower-v1.1.2.infra.md diff --git a/containers/shower/default.nix b/containers/shower/default.nix index 4f807ed..aef9c94 100644 --- a/containers/shower/default.nix +++ b/containers/shower/default.nix @@ -25,7 +25,7 @@ { pkgs ? import { } }: let - version = "1.1.1"; + version = "1.1.2"; python = pkgs.python314; @@ -43,7 +43,7 @@ let showerSdist = pkgs.fetchurl { name = "adelaide_baby_shower_app-${version}.tar.gz"; url = "https://forge.ops.eblu.me/api/packages/eblume/pypi/files/adelaide-baby-shower-app/${version}/adelaide_baby_shower_app-${version}.tar.gz"; - hash = "sha256-muvjkcKnLrrQTb8HZ4cH9SD0pab05JSFSgwheqb0AyM="; + hash = "sha256-U00259dlvHSo0c9I/W0kSThyhNKUT8ukG6X+vzj0k9c="; }; # Wheel pulled from forge.ops.eblu.me (tailnet) for the same reason the @@ -53,7 +53,7 @@ let showerWheel = pkgs.fetchurl { name = "adelaide_baby_shower_app-${version}-py3-none-any.whl"; url = "https://forge.ops.eblu.me/api/packages/eblume/pypi/files/adelaide-baby-shower-app/${version}/adelaide_baby_shower_app-${version}-py3-none-any.whl"; - hash = "sha256-dorrwHhZhOn9Qq6Wk3Su24HckgaWtWbkMY7RtAvomv4="; + hash = "sha256-lF79G9SiCuxG9LcyDJkTeTeJL72qTJTDVE196At1Ods="; }; staticAssets = pkgs.runCommand "shower-static-assets-${version}" { } '' @@ -148,7 +148,7 @@ let outputHashAlgo = "sha256"; # Pinned dep closure — reproducible until version bumps. To recompute, # set to pkgs.lib.fakeHash and read the failure. - outputHash = "sha256-HTTmAldIijG03pYZNyO72LBNPCrjmyJQKgW+gU9NplI="; + outputHash = pkgs.lib.fakeHash; dontFixup = true; }; diff --git a/docs/changelog.d/shower-v1.1.2.infra.md b/docs/changelog.d/shower-v1.1.2.infra.md new file mode 100644 index 0000000..aa2db0d --- /dev/null +++ b/docs/changelog.d/shower-v1.1.2.infra.md @@ -0,0 +1 @@ +Deploy shower v1.1.2 — bump container build to new app release. -- 2.50.1 (Apple Git-155) From b8c77834433da668a77c65581550279f2e37435c Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Fri, 15 May 2026 06:26:33 -0700 Subject: [PATCH 2/3] C1: pin shower v1.1.2 FOD outputHash (probed on ringtail) Bump service-versions.yaml to match the new nix version so the container-version-check pre-commit hook stays green. Co-Authored-By: Claude Opus 4.7 (1M context) --- containers/shower/default.nix | 2 +- service-versions.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/shower/default.nix b/containers/shower/default.nix index aef9c94..f7115bc 100644 --- a/containers/shower/default.nix +++ b/containers/shower/default.nix @@ -148,7 +148,7 @@ let outputHashAlgo = "sha256"; # Pinned dep closure — reproducible until version bumps. To recompute, # set to pkgs.lib.fakeHash and read the failure. - outputHash = pkgs.lib.fakeHash; + outputHash = "sha256-B5INpydOP3DmlgHfgpzKf+2mv0y9Wr2YNK7/5kh0hOc="; dontFixup = true; }; diff --git a/service-versions.yaml b/service-versions.yaml index 63bc5df..02f2979 100644 --- a/service-versions.yaml +++ b/service-versions.yaml @@ -46,8 +46,8 @@ services: - name: shower type: argocd - last-reviewed: 2026-05-11 - current-version: "1.1.0" + last-reviewed: 2026-05-15 + current-version: "1.1.2" upstream-source: https://forge.eblu.me/eblume/adelaide-baby-shower-app notes: | Django app for Adelaide / Heidi / Addie's baby shower. Wheel -- 2.50.1 (Apple Git-155) From 24807d608af42d207b3ebd97db4388fd6c73ee02 Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Fri, 15 May 2026 06:29:02 -0700 Subject: [PATCH 3/3] C1: deploy shower v1.1.2 (kustomize newTag bump) Co-Authored-By: Claude Opus 4.7 (1M context) --- argocd/manifests/shower/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argocd/manifests/shower/kustomization.yaml b/argocd/manifests/shower/kustomization.yaml index c0cf4c8..2c4dadb 100644 --- a/argocd/manifests/shower/kustomization.yaml +++ b/argocd/manifests/shower/kustomization.yaml @@ -14,4 +14,4 @@ resources: images: - name: registry.ops.eblu.me/blumeops/shower - newTag: v1.1.1-4e117dc-nix + newTag: v1.1.2-b8c7783-nix -- 2.50.1 (Apple Git-155)