Erich Blume
ecded30073
## Summary Weekly "make one non-local container local" pickup: immich-ringtail still pulled `docker.io/valkey/valkey:8.1.6` because the existing `containers/valkey/container.py` build was arm64-only. - Adds `containers/valkey/default.nix` — nix-built amd64 valkey image, packaged by the ringtail nix-container-builder runner using `pkgs.dockerTools.buildLayeredImage`. Mirrors the existing `containers/authentik-redis/default.nix` pattern. - `containers/valkey/container.py` keeps building the Alpine arm64 image for paperless on indri. Bumped both builds to upstream valkey 8.1.7 (Alpine 3.22 now ships `8.1.7-r0`; nixpkgs has 8.1.7). - Splits `VERSION` (upstream app) from `ALPINE_PIN` (apk pin) in `container.py` so both build files can declare the same upstream version and pass `container-version-check`. - Updates `service-versions.yaml`: current-version 8.1.7, refreshed last-reviewed, upstream-source now points at the canonical valkey-io releases page. - Switches kustomizations: - `immich-ringtail/kustomization.yaml`: `docker.io/valkey/valkey:8.1.6` → `registry.ops.eblu.me/blumeops/valkey:v8.1.7-02859c5-nix`, comment updated. - `paperless/kustomization.yaml`: `v8.1.6-r0-fabca04` → `v8.1.7-02859c5`. ## Build build-container run #563 — both jobs succeeded after a transient runner crash on the first dispatch (#562 build-nix), which surfaced two separate bugs that landed in a separate C0 on main: - `runner-logs` silently returned 0 with no output when the log file didn't exist on indri - `ssh indri` swallowing remote exit codes (fish login shell), which the wrapper now works around via a stdout marker ## Test plan - [ ] `argocd app set immich-ringtail --revision valkey-nix && argocd app sync immich-ringtail` - [ ] `argocd app set paperless --revision valkey-nix && argocd app sync paperless` - [ ] Both valkey pods come Ready and start serving on :6379 - [ ] Immich app + paperless can read/write their respective cache - [ ] After merge: rebuild from squashed main commit + update kustomization tags (squash-tag follow-up) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Reviewed-on: #362
48 lines
1.4 KiB
Python
48 lines
1.4 KiB
Python
"""Valkey — native Dagger build (arm64, indri).
|
|
|
|
Alpine 3.22 base with the `valkey` apk package (8.1.x — Redis-compatible).
|
|
Used by paperless (sidecar) on indri. immich on ringtail uses the
|
|
nix-built amd64 variant from `default.nix` in this directory.
|
|
"""
|
|
|
|
import dagger
|
|
from dagger import dag
|
|
|
|
from blumeops.containers import oci_labels
|
|
|
|
# Alpine 3.22 currently ships valkey 8.1.7-r0. Alpine 3.23 jumps to 9.0 —
|
|
# hold on 3.22 to keep this aligned with the 8.1 line.
|
|
VERSION = "8.1.7"
|
|
ALPINE_PIN = "8.1.7-r0"
|
|
|
|
ALPINE_BASE = "alpine:3.22"
|
|
|
|
|
|
async def build(src: dagger.Directory) -> dagger.Container:
|
|
ctr = (
|
|
dag.container()
|
|
.from_(ALPINE_BASE)
|
|
.with_exec(["apk", "add", "--no-cache", f"valkey={ALPINE_PIN}"])
|
|
.with_exec(["mkdir", "-p", "/data"])
|
|
.with_exec(["chown", "valkey:valkey", "/data"])
|
|
.with_workdir("/data")
|
|
.with_exposed_port(6379)
|
|
.with_user("valkey")
|
|
.with_default_args(
|
|
args=[
|
|
"valkey-server",
|
|
"--bind",
|
|
"0.0.0.0",
|
|
"--protected-mode",
|
|
"no",
|
|
"--dir",
|
|
"/data",
|
|
]
|
|
)
|
|
)
|
|
return oci_labels(
|
|
ctr,
|
|
title="Valkey",
|
|
description="Valkey high-performance key/value datastore (Redis-compatible)",
|
|
version=VERSION,
|
|
)
|