fixup! Add nginx (closes #11)

Model: deepseek-v4-pro
This commit is contained in:
2026-11-05 15:03:50 +00:00
parent ffd28be744
commit 51f5fe3e7e
3 changed files with 49 additions and 48 deletions
+5 -5
View File
@@ -12,7 +12,7 @@ Image: `git.eeqj.de/sneak/baseimage`, built for `linux/amd64` and
## What is in it ## What is in it
| Component | Source | Location | | Component | Source | Location |
| --------------- | ------------------------------ | ------------------------------ | | ------------------- | ------------------------------------------ | ------------------------------------------------ |
| Ubuntu 26.04 | `ubuntu:26.04`, fully upgraded | `/` | | Ubuntu 26.04 | `ubuntu:26.04`, fully upgraded | `/` |
| init | `runsvinit` (built from Go) | `/usr/local/sbin/runsvinit` | | init | `runsvinit` (built from Go) | `/usr/local/sbin/runsvinit` |
| services | `runit` (apt) | `/etc/sv`, `/etc/service` | | services | `runit` (apt) | `/etc/sv`, `/etc/service` |
@@ -202,8 +202,8 @@ Every unpinned version is resolved at build time, so a rebuild picks up
current packages and tool releases. Rebuild and retag periodically; child current packages and tool releases. Rebuild and retag periodically; child
images get everything new on their next build. images get everything new on their next build.
The registry sits behind Traefik. The large `RUN` layer (about 650MB The registry sits behind Traefik. The large `RUN` layer (about 1.63 GB
compressed, over 2GB uncompressed) needs the entrypoint compressed, 4.3 GB on disk) needs the entrypoint
`respondingTimeouts` raised from Traefik's 60 second default, or the final `respondingTimeouts` raised from Traefik's 60 second default, or the final
blob commit fails with a 499 or 500 and docker re-uploads the layer. blob commit fails with a 499 or 500 and docker re-uploads the layer.
@@ -218,7 +218,7 @@ Interactive shells (login shells, or anything that sources
`commit-logs`, `clean`, plus `lib.sh` (shared setup) and `native-arch`. `commit-logs`, `clean`, plus `lib.sh` (shared setup) and `native-arch`.
- `Dockerfile` — base, environment, one `COPY`, one `ADD`, one `RUN`. - `Dockerfile` — base, environment, one `COPY`, one `ADD`, one `RUN`.
- `build.sh` — everything the `RUN` does, in order: apt, Go, runsvinit, - `build.sh` — everything the `RUN` does, in order: apt, Go, runsvinit,
golangci-lint, Hugo, nvm/Node/corepack/wrangler, pyenv/Python, cleanup, golangci-lint, govulncheck, Hugo, nvm/Node/corepack/wrangler, browsers,
sanity checks. Removes itself when done. pyenv/Python, cleanup, sanity checks. Removes itself when done.
- `rootfs/` — files copied verbatim onto `/` before `build.sh` runs. - `rootfs/` — files copied verbatim onto `/` before `build.sh` runs.
- `logs/YYYY-MM-DD/` — build logs for each released image, per arch. - `logs/YYYY-MM-DD/` — build logs for each released image, per arch.
+1 -1
View File
@@ -39,7 +39,7 @@ docker run --rm "$img" bash -ec '
valkey-cli shutdown nosave valkey-cli shutdown nosave
psql --version psql --version
postgres --version postgres --version
nginx -v nginx -t
playwright --version playwright --version
firefox --version firefox --version
geckodriver --version geckodriver --version
+4 -3
View File
@@ -146,8 +146,9 @@ rm -rf /usr/share/doc /usr/share/man /usr/share/info /usr/share/lintian
find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name 'en*' ! -name 'locale.alias' -exec rm -rf {} + find /usr/share/locale -mindepth 1 -maxdepth 1 ! -name 'en*' ! -name 'locale.alias' -exec rm -rf {} +
rm -rf /root/.cache /root/.npm /root/.config /root/go /tmp/* /var/tmp/* rm -rf /root/.cache /root/.npm /root/.config /root/go /tmp/* /var/tmp/*
# Valkey opens its log file at startup; recreate the log directory the # nginx and Valkey open their log files at startup; recreate the log
# cleanup above removed, with its package owner. # directories the cleanup above removed, with their package owners.
install -d -o root -g adm /var/log/nginx
install -d -o valkey -g adm -m 2750 /var/log/valkey install -d -o valkey -g adm -m 2750 /var/log/valkey
# --- sanity ------------------------------------------------------------------ # --- sanity ------------------------------------------------------------------
@@ -171,7 +172,7 @@ valkey-cli ping
valkey-cli shutdown nosave valkey-cli shutdown nosave
psql --version psql --version
postgres --version postgres --version
nginx -v nginx -t
hugo version hugo version
node --version node --version
npm --version npm --version