Set the images' own OCI labels instead of Ubuntu's #224

Merged
sneak merged 2 commits from issue-216-oci-labels into next 2026-11-19 03:41:58 +01:00
Collaborator

Closes #216.

The final stage of the Dockerfile now sets the image's own OCI labels, so it no longer shows the ones it would inherit from Ubuntu: title, description, version, created, revision and source. The version, created and revision labels come from the build arguments VERSION, CREATED and REVISION. Each defaults to unknown, so a plain docker build . still replaces Ubuntu's values. script/docker and script/cibuild pass all three, and CI runs script/cibuild. The example app in deploy/example-app sets its own title and description.

What the diff does not show:

  • The final stage's ARG VERSION=unknown belongs to that stage only. The builder stage's ARG VERSION still has no default, and its version check works as before.
  • The example app takes version, created, revision and source from the smallwebwaf image it is built on, which is built from the same checkout.

Disclosures:

  • Not built or tested locally, by sneak's order on the issue: CI tests it.
  • Labelled merge-ready and assigned to sneak with no review, by his order on the issue. This cuts against the rule that a worker never labels its own work merge-ready.

Model: opus-5-5

Closes https://git.eeqj.de/sneak/smallwebwaf/issues/216. The final stage of the `Dockerfile` now sets the image's own OCI labels, so it no longer shows the ones it would inherit from Ubuntu: `title`, `description`, `version`, `created`, `revision` and `source`. The `version`, `created` and `revision` labels come from the build arguments `VERSION`, `CREATED` and `REVISION`. Each defaults to `unknown`, so a plain `docker build .` still replaces Ubuntu's values. `script/docker` and `script/cibuild` pass all three, and CI runs `script/cibuild`. The example app in `deploy/example-app` sets its own title and description. What the diff does not show: - The final stage's `ARG VERSION=unknown` belongs to that stage only. The builder stage's `ARG VERSION` still has no default, and its version check works as before. - The example app takes `version`, `created`, `revision` and `source` from the smallwebwaf image it is built on, which is built from the same checkout. Disclosures: - Not built or tested locally, by sneak's order on the issue: CI tests it. - Labelled `merge-ready` and assigned to sneak with no review, by his order on the issue. This cuts against the rule that a worker never labels its own work `merge-ready`. Model: opus-5-5
sneak was assigned by clawbot 2026-11-07 13:39:54 +01:00
clawbot added the merge-ready label 2026-11-07 13:39:54 +01:00
clawbot added the needs-rebase label 2026-11-14 18:44:44 +01:00
Author
Collaborator

For the reworker: this PR no longer merges into next after the README PRs landed. Rebase it onto current next, resolve the conflicts so the PR keeps exactly its change, run make check, and force-push. Change nothing else. It stays assigned to sneak for his merge; merge-ready returns once it merges cleanly.

Model: opus-5-5

For the reworker: this PR no longer merges into `next` after the README PRs landed. Rebase it onto current `next`, resolve the conflicts so the PR keeps exactly its change, run `make check`, and force-push. Change nothing else. It stays assigned to sneak for his merge; `merge-ready` returns once it merges cleanly. Model: opus-5-5
clawbot removed the merge-ready label 2026-11-14 18:53:06 +01:00
clawbot added 1 commit 2026-11-14 19:00:27 +01:00
The image sets title, description, version, created, revision and
source; the last three known only at build time come from build
arguments that default to unknown, and script/docker and
script/cibuild pass them. The example app sets its own title and
description.

Model: opus-5-5
clawbot force-pushed issue-216-oci-labels from 6d78846014 to a93243a294 2026-11-14 19:00:27 +01:00 Compare
clawbot removed the needs-rebase label 2026-11-14 19:00:36 +01:00
Author
Collaborator
  • Rebased onto next and force-pushed; git applied the change with no textual conflict.
  • The image's description label named sww discriminator, which next renamed to sww waf (#312). The label now says sww waf; nothing else changed.
  • Still assigned to sneak; needs-rebase removed. merge-ready is left to the manager: a worker never labels its own PR merge-ready.

Model: opus-5-5

- Rebased onto `next` and force-pushed; git applied the change with no textual conflict. - The image's description label named `sww discriminator`, which `next` renamed to `sww waf` (https://git.eeqj.de/sneak/smallwebwaf/issues/312). The label now says `sww waf`; nothing else changed. - Still assigned to sneak; `needs-rebase` removed. `merge-ready` is left to the manager: a worker never labels its own PR `merge-ready`. Model: opus-5-5
Author
Collaborator

Rebased and mergeable again; merge-ready restored for sneak.

Model: opus-5-5

Rebased and mergeable again; `merge-ready` restored for sneak. Model: opus-5-5
clawbot added the merge-ready label 2026-11-14 19:23:07 +01:00
sneak added 1 commit 2026-11-19 03:41:53 +01:00
Merge branch 'next' into issue-216-oci-labels
check / check (push) Successful in 7m10s
b9972af6a0
sneak merged commit 4cb91a4870 into next 2026-11-19 03:41:58 +01:00
sneak deleted branch issue-216-oci-labels 2026-11-19 03:41:58 +01:00
Sign in to join this conversation.