Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
66cdd01999 C1: deploy shower v1.1.0 to ringtail (kustomization + changelog)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 18:35:26 -07:00
444ff91b61 C1: pin shower v1.1.0 FOD outputHash from run 547
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 17:22:20 -07:00
a156ea7687 C1: shower — copy wheel to clean filename before pip install
Nix store paths embed a 32-char hash prefix, which pip rejects as
"Invalid wheel filename (invalid version)". Copy the wheel into TMPDIR
under its bare name first, then install from there.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 17:17:02 -07:00
e534100254 C1: shower default.nix — fetchurl wheel directly (probe FOD)
Forgejo's PyPI simple index returns absolute file URLs hardcoded to its
public ROOT_URL (forge.eblu.me). The Fly edge blocks /api/packages/* per
PR #2d38418e, so pip-install through the index 403s the wheel download
even when reached from the tailnet. Mirror what we already do for the
sdist: pull the wheel via fetchurl from forge.ops.eblu.me and hand it to
pip as a local path. The forge --extra-index-url is no longer needed.

Also bumps service-versions.yaml current-version to v1.1.0 to satisfy
container-version-check (the kustomization newTag follows once the nix
build pins its FOD hash).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 17:14:35 -07:00
38daa3b0c3 C1: bump shower to v1.1.0 (probe FOD hash)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-11 17:02:31 -07:00
4 changed files with 47 additions and 13 deletions

View file

@ -14,4 +14,4 @@ resources:
images:
- name: registry.ops.eblu.me/blumeops/shower
newTag: v1.0.2-292d354-nix
newTag: v1.1.0-444ff91-nix

View file

@ -1,11 +1,15 @@
# Nix-built shower app container — Adelaide / Heidi / Addie baby shower.
#
# The app is published as a wheel to the Forgejo PyPI index at
# https://forge.eblu.me/api/packages/eblume/pypi/. The wheel + its
# transitive Python deps are baked in at build time via a fixed-output
# derivation that runs `pip install --target` against forge PyPI (proxied
# through pypi.ops.eblu.me for upstream packages). Build runs on the
# nix-container-builder runner (ringtail, amd64) so the image is native.
# https://forge.ops.eblu.me/api/packages/eblume/pypi/ (tailnet-only — the
# public forge.eblu.me /api/packages/* surface is blocked at the Fly edge).
# We can't point pip at Forgejo's simple index even from the tailnet,
# because Forgejo's index returns absolute file URLs hardcoded to its
# public ROOT_URL (forge.eblu.me), which then 403s. So both the wheel and
# the sdist are pulled by direct `fetchurl` against forge.ops.eblu.me, and
# the wheel is then handed to `pip install` as a local path; transitive
# deps come from pypi.ops.eblu.me. Build runs on the nix-container-builder
# runner (ringtail, amd64) so the image is native.
#
# Going through pip-install-target rather than nixpkgs Python packages
# sidesteps two issues we hit going through `python.pkgs.buildPythonPackage`:
@ -21,7 +25,7 @@
{ pkgs ? import <nixpkgs> { } }:
let
version = "1.0.2";
version = "1.1.0";
python = pkgs.python314;
@ -39,7 +43,17 @@ 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-nlCtlx9zuYaLoJZSckybLV5YPpA8vZamN96O3RXOstM=";
hash = "sha256-5dp+0u4metOIC6s6/nPlT4cdpFBCV6S3+Z/3RO0sX5U=";
};
# Wheel pulled from forge.ops.eblu.me (tailnet) for the same reason the
# sdist is: Forgejo's PyPI simple index would return forge.eblu.me URLs
# that the Fly edge 403s on /api/packages/*. We hand this path to pip
# below so it never touches the forge index at all.
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-7orFbycON9dQxEIb6q45Xx2rFlEZ8xXSrC2tnrO5uug=";
};
staticAssets = pkgs.runCommand "shower-static-assets-${version}" { } ''
@ -68,11 +82,16 @@ let
${python}/bin/python -m venv "$TMPDIR/venv"
"$TMPDIR/venv/bin/pip" install --upgrade pip
# Nix store paths embed a 32-char hash prefix, which pip's wheel
# filename parser rejects ("Invalid wheel filename"). Copy to a
# clean filename in TMPDIR before installing.
cp ${showerWheel} "$TMPDIR/${showerWheel.name}"
"$TMPDIR/venv/bin/pip" install \
--no-cache-dir \
--index-url=https://pypi.ops.eblu.me/root/pypi/+simple/ \
--extra-index-url=https://forge.ops.eblu.me/api/packages/eblume/pypi/simple/ \
"adelaide-baby-shower-app==${version}" \
"$TMPDIR/${showerWheel.name}" \
gunicorn
runHook postBuild
@ -129,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-tSTH/HaDY7M0qxlauBTM+JekZAgF++K2lGP3PLvym/o=";
outputHash = "sha256-kTNOswobtkgyQmmqbQM8XO4vvaGg57nCuuZGbNXb0NM=";
dontFixup = true;
};

View file

@ -0,0 +1,15 @@
Deploy adelaide-baby-shower-app v1.1.0 to ringtail k3s. Replaces the
boolean lock with a four-phase `ShowerState` (`pre_event``party`
`prizes_locked``event_locked`), adds an append-only "guest memories"
panel where guests can leave photos and comments for the baby, and
polishes the admin and QR views. Three Django migrations
(`0009_shower_phase`, `0010_guest_memories`, `0011_book_description`)
run automatically in the entrypoint against the SQLite PV. No config
or env-var changes.
Container build also gains a Forgejo-PyPI workaround: Forgejo's simple
index returns absolute file URLs hardcoded to the public ROOT_URL
(`forge.eblu.me`), which the Fly edge 403s on `/api/packages/*`. The
wheel and sdist are now both pulled via direct `fetchurl` against
`forge.ops.eblu.me` (tailnet-only) and the wheel is handed to pip as
a local path.

View file

@ -46,8 +46,8 @@ services:
- name: shower
type: argocd
last-reviewed: 2026-05-10
current-version: "1.0.2"
last-reviewed: 2026-05-11
current-version: "1.1.0"
upstream-source: https://forge.eblu.me/eblume/adelaide-baby-shower-app
notes: |
Django app for Adelaide / Heidi / Addie's baby shower. Wheel