mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-10 04:36:40 +00:00
kevinveenbirkenbachandClaude Opus 4.7
a77a570409
Closes a stack of env-pipeline regressions left over from the recent
INFINITO_* namespace refactor by:
* DOMAIN_PRIMARY now reads INFINITO_DOMAIN strictly (was: legacy DOMAIN
env var → defaulted to infinito.localhost, which never resolved
because CoreDNS serves the INFINITO_DOMAIN value, infinito.example).
* group_vars/all/08_networks.yml IPs (ip4/ip6/dns) now read
INFINITO_IP4 / INFINITO_IP6 / INFINITO_DNS_IP.
* PLAYWRIGHT_KEEP_ALL renamed to INFINITO_PLAYWRIGHT_KEEP end-to-end
(env-builder, role default, run_one.yml docker exec, playwright.config.js,
lint allowlist, docs anchor, CI workflow vars).
* PKGMGR_IMAGE renamed to INFINITO_PARENT_IMAGE; Dockerfile ARG drops
the inline default so env/default.env is the only SPOT.
* INFINITO_SRC_DIR centralized: Dockerfile ARG (no default) + ENV;
compose forwards it as build-arg, volume mount path, and container env;
every Python CLI + shell helper + CI workflow now reads it strictly
(os.environ[...] / "${INFINITO_SRC_DIR:?...}") instead of the literal
/opt/src/infinito.
* New entries in env/default.env: INFINITO_IP6=::1, INFINITO_PARENT_IMAGE,
INFINITO_PLAYWRIGHT_KEEP=false. All three propagated through
utils/env/handlers/passthrough.STATIC_KEYS and (where consumed in the
container) through compose.yml's environment block.
Validated end-to-end with `make test` (2360 tests across lint, lint-*,
test-lint, test-external, test-unit, test-integration).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
98 lines
3.9 KiB
Docker
98 lines
3.9 KiB
Docker
# syntax=docker/dockerfile:1
|
|
|
|
# Base image (pkgmgr) selector. SPOT lives in env/default.env's
|
|
# INFINITO_PARENT_IMAGE and is forwarded as a build arg by compose.yml /
|
|
# scripts/image/build.sh.
|
|
# Example values:
|
|
# INFINITO_PARENT_IMAGE=ghcr.io/kevinveenbirkenbach/pkgmgr-arch:stable
|
|
# INFINITO_PARENT_IMAGE=ghcr.io/kevinveenbirkenbach/pkgmgr-arch-slim:stable
|
|
ARG INFINITO_PARENT_IMAGE
|
|
FROM ${INFINITO_PARENT_IMAGE} AS full
|
|
|
|
# Hadolint DL4006: ensure pipefail is set for RUN instructions that use pipes
|
|
SHELL ["/bin/bash", "-o", "pipefail", "-lc"]
|
|
|
|
# Forwardable build-time Nix settings (e.g., GitHub access tokens to avoid rate limits)
|
|
ARG NIX_CONFIG
|
|
|
|
# SPOT for the bind-mounted source tree inside the container. The compose
|
|
# stack forwards env/default.env's INFINITO_SRC_DIR as a build arg.
|
|
ARG INFINITO_SRC_DIR
|
|
ENV INFINITO_SRC_DIR=${INFINITO_SRC_DIR}
|
|
ENV PYTHON="/opt/venvs/infinito/bin/python"
|
|
ENV PIP="/opt/venvs/infinito/bin/python -m pip"
|
|
ENV PATH="/opt/venvs/infinito/bin:${PATH}"
|
|
|
|
# Make Nix non-interactive for flake config (CI-friendly)
|
|
RUN set -euo pipefail; \
|
|
cat /etc/os-release || true; \
|
|
if [ -f /etc/nix/nix.conf ]; then \
|
|
grep -q '^accept-flake-config *= *true' /etc/nix/nix.conf || \
|
|
echo 'accept-flake-config = true' >> /etc/nix/nix.conf; \
|
|
fi
|
|
|
|
# ------------------------------------------------------------
|
|
# Infinito.Nexus source in
|
|
# ------------------------------------------------------------
|
|
COPY . ${INFINITO_SRC_DIR}
|
|
|
|
# ------------------------------------------------------------
|
|
# Install Python 3.11+, Docker CLI, and distro package dependencies
|
|
# ------------------------------------------------------------
|
|
# hadolint ignore=DL3008,DL3033,DL3041
|
|
RUN set -euo pipefail; \
|
|
/bin/bash ${INFINITO_SRC_DIR}/roles/dev-python/files/install.sh; \
|
|
/bin/bash ${INFINITO_SRC_DIR}/roles/sys-svc-container/files/install-cli.sh; \
|
|
/bin/bash ${INFINITO_SRC_DIR}/scripts/install/package.sh
|
|
|
|
# ------------------------------------------------------------
|
|
# Disable interactive first-boot units (CI / container safe)
|
|
# ------------------------------------------------------------
|
|
RUN set -euo pipefail; \
|
|
systemctl mask systemd-firstboot.service first-boot-complete.target || true; \
|
|
systemd-machine-id-setup || true
|
|
|
|
# systemd-in-container conventions
|
|
ENV container=docker
|
|
STOPSIGNAL SIGRTMIN+3
|
|
|
|
# ------------------------------------------------------------
|
|
# Install infinito via pkgmgr (shallow) and override it with local source
|
|
# ------------------------------------------------------------
|
|
RUN set -euo pipefail; \
|
|
export NIX_CONFIG="${NIX_CONFIG:-}"; \
|
|
echo "[docker-infinito] Install Infinito.Nexus via pkgmgr"; \
|
|
pkgmgr install infinito --clone-mode shallow; \
|
|
echo "[docker-infinito] Installed Infinito.Nexus Version:"; \
|
|
pkgmgr version infinito; \
|
|
"${INFINITO_SRC_DIR}/scripts/docker/entry.sh" --compile -- true
|
|
|
|
# Set workdir to / to avoid ambiguous commands
|
|
WORKDIR /
|
|
|
|
COPY scripts/docker/healthcheck.sh /usr/local/bin/healthcheck.sh
|
|
RUN chmod +x /usr/local/bin/healthcheck.sh
|
|
# Allow 20s because `infinito --help` can exceed 5s on fresh CI runners.
|
|
HEALTHCHECK --interval=5s --timeout=20s --start-period=30s --retries=20 \
|
|
CMD /usr/local/bin/healthcheck.sh
|
|
|
|
# JSON-form ENTRYPOINT does not expand ENV vars; wrap via bash -c so the
|
|
# INFINITO_SRC_DIR SPOT still controls the path. `exec` preserves systemd
|
|
# signal forwarding; `--` is the placeholder for $0.
|
|
ENTRYPOINT ["/bin/bash", "-c", "exec \"${INFINITO_SRC_DIR}/scripts/docker/entry.sh\" \"$@\"", "--"]
|
|
|
|
# IMPORTANT: default to systemd as PID 1
|
|
CMD ["/sbin/init"]
|
|
|
|
|
|
# ============================================================
|
|
# Target: slim
|
|
# - based on full, runs slim.sh
|
|
# ============================================================
|
|
FROM full AS slim
|
|
|
|
# Image cleanup (reduce final size)
|
|
RUN set -eu; \
|
|
test -x /usr/local/bin/slim.sh || { echo "slim.sh missing in base image" >&2; exit 1; }; \
|
|
/usr/local/bin/slim.sh
|