From: Arran Cudbard-Bell Date: Tue, 19 May 2026 17:22:45 +0000 (-0400) Subject: docker: rename type identifiers to service / ci / crossbuild X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d24f68ea34ebd18deea0d5ecf4b27bb79feefb81;p=thirdparty%2Ffreeradius-server.git docker: rename type identifiers to service / ci / crossbuild The m4-generated Dockerfile family used inconsistent labels: the production image was called "docker" (overloaded with the make namespace), the CI base image was called "ci-base", and crossbuild was already correctly named. Rename the m4 source files (docker.{deb,rpm}.m4 -> service.{deb,rpm}.m4, ci-base.{deb,rpm}.m4 -> ci.{deb,rpm}.m4), the D_TYPE values passed to m4, and the make bundle targets to docker..regen[.check] so all docker-adjacent targets share a single namespace prefix. The dispatcher template's "Rebuild this file with" header now points at the bundle target (make docker..regen) since per-image regen phonies were retired in an earlier commit. Workflow steps and the top-level Makefile conditional include were updated to match; the docker-refresh.yml inline comment that referenced ci-base.m4 was corrected too. --- diff --git a/.github/workflows/crossbuild.yml b/.github/workflows/crossbuild.yml index afa9dd33cf8..e375796d9cd 100644 --- a/.github/workflows/crossbuild.yml +++ b/.github/workflows/crossbuild.yml @@ -150,7 +150,7 @@ jobs: CB_FROM_rocky9: docker.internal.networkradius.com/self-hosted-rocky9 CB_FROM_rocky10: docker.internal.networkradius.com/self-hosted-rocky10 run: | - make crossbuild.regen.check + make docker.crossbuild.regen.check make crossbuild.$OS - name: Show build log @@ -263,7 +263,7 @@ jobs: - name: Run crossbuild tests run: | - make crossbuild.regen.check + make docker.crossbuild.regen.check make crossbuild.$OS - name: Show build log diff --git a/.github/workflows/docker-refresh.yml b/.github/workflows/docker-refresh.yml index 8fd13029a6f..374eacdc216 100644 --- a/.github/workflows/docker-refresh.yml +++ b/.github/workflows/docker-refresh.yml @@ -41,8 +41,8 @@ jobs: # # Slim build bases for ci-rpm.yml / ci-deb.yml. Generated from - # scripts/docker/m4/ci-base.{rpm,deb}.m4 - regenerate with - # `make ci-base..regen` after editing the m4. The + # scripts/docker/m4/ci.{rpm,deb}.m4 - regenerate with + # `make docker.ci.regen` after editing the m4. The # generated Dockerfile.ci hardcodes the per-distro FROM, so # no build_args are needed here. # diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5374553e410..b2d4819e318 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -129,7 +129,7 @@ jobs: password: ${{ secrets.DOCKERHUB_READ_KEY }} - name: Verify Dockerfiles match m4 templates - run: make docker.regen.check + run: make docker.service.regen.check - name: Build docker image run: | @@ -227,7 +227,7 @@ jobs: packages: m4 make - name: Verify Dockerfiles match m4 templates - run: make docker.regen.check + run: make docker.service.regen.check - name: Build docker image run: | diff --git a/Makefile b/Makefile index 46804660d0d..018489712c3 100644 --- a/Makefile +++ b/Makefile @@ -572,10 +572,9 @@ ifneq "$(findstring crossbuild,$(MAKECMDGOALS))" "" endif # -# Conditionally include the docker make file. Also triggered by the -# ci-base.* family of targets defined inside docker.mk. +# Conditionally include the docker make file. # -ifneq "$(or $(findstring docker,$(MAKECMDGOALS)),$(findstring ci-base,$(MAKECMDGOALS)))" "" +ifneq "$(findstring docker,$(MAKECMDGOALS))" "" include scripts/docker/docker.mk endif diff --git a/scripts/docker/build/debian12/Dockerfile b/scripts/docker/build/debian12/Dockerfile index e7b63a98737..2290800120f 100644 --- a/scripts/docker/build/debian12/Dockerfile +++ b/scripts/docker/build/debian12/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for debian12 -# from scripts/docker/m4/docker.deb.m4 +# from scripts/docker/m4/service.deb.m4 # -# Rebuild this file with `make docker.debian12.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=debian:bookworm FROM ${from} AS build diff --git a/scripts/docker/build/debian12/Dockerfile.cb b/scripts/docker/build/debian12/Dockerfile.cb index c891562214e..d1521adcb10 100644 --- a/scripts/docker/build/debian12/Dockerfile.cb +++ b/scripts/docker/build/debian12/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for debian12 # from scripts/docker/m4/crossbuild.deb.m4 # -# Rebuild this file with `make crossbuild.debian12.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=debian:bookworm FROM ${from} AS build diff --git a/scripts/docker/build/debian12/Dockerfile.ci b/scripts/docker/build/debian12/Dockerfile.ci index abe2eaa9c18..89cd5899c9a 100644 --- a/scripts/docker/build/debian12/Dockerfile.ci +++ b/scripts/docker/build/debian12/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for debian12 -# from scripts/docker/m4/ci-base.deb.m4 +# from scripts/docker/m4/ci.deb.m4 # -# Rebuild this file with `make ci-base.debian12.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=debian:bookworm FROM ${from} diff --git a/scripts/docker/build/debian13/Dockerfile b/scripts/docker/build/debian13/Dockerfile index ebfac9524b6..2e6d86f5803 100644 --- a/scripts/docker/build/debian13/Dockerfile +++ b/scripts/docker/build/debian13/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for debian13 -# from scripts/docker/m4/docker.deb.m4 +# from scripts/docker/m4/service.deb.m4 # -# Rebuild this file with `make docker.debian13.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=debian:trixie FROM ${from} AS build diff --git a/scripts/docker/build/debian13/Dockerfile.cb b/scripts/docker/build/debian13/Dockerfile.cb index e0a3d226641..0e01f643f08 100644 --- a/scripts/docker/build/debian13/Dockerfile.cb +++ b/scripts/docker/build/debian13/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for debian13 # from scripts/docker/m4/crossbuild.deb.m4 # -# Rebuild this file with `make crossbuild.debian13.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=debian:trixie FROM ${from} AS build diff --git a/scripts/docker/build/debian13/Dockerfile.ci b/scripts/docker/build/debian13/Dockerfile.ci index 928a2ad442b..fdae232e59c 100644 --- a/scripts/docker/build/debian13/Dockerfile.ci +++ b/scripts/docker/build/debian13/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for debian13 -# from scripts/docker/m4/ci-base.deb.m4 +# from scripts/docker/m4/ci.deb.m4 # -# Rebuild this file with `make ci-base.debian13.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=debian:trixie FROM ${from} diff --git a/scripts/docker/build/debiansid/Dockerfile b/scripts/docker/build/debiansid/Dockerfile index 8b7cf76300f..05e58338b22 100644 --- a/scripts/docker/build/debiansid/Dockerfile +++ b/scripts/docker/build/debiansid/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for debiansid -# from scripts/docker/m4/docker.deb.m4 +# from scripts/docker/m4/service.deb.m4 # -# Rebuild this file with `make docker.debiansid.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=debian:sid FROM ${from} AS build diff --git a/scripts/docker/build/debiansid/Dockerfile.cb b/scripts/docker/build/debiansid/Dockerfile.cb index ad679814753..2b9e2bc967b 100644 --- a/scripts/docker/build/debiansid/Dockerfile.cb +++ b/scripts/docker/build/debiansid/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for debiansid # from scripts/docker/m4/crossbuild.deb.m4 # -# Rebuild this file with `make crossbuild.debiansid.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=debian:sid FROM ${from} AS build diff --git a/scripts/docker/build/debiansid/Dockerfile.ci b/scripts/docker/build/debiansid/Dockerfile.ci index 3764247dff2..d314eecfac7 100644 --- a/scripts/docker/build/debiansid/Dockerfile.ci +++ b/scripts/docker/build/debiansid/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for debiansid -# from scripts/docker/m4/ci-base.deb.m4 +# from scripts/docker/m4/ci.deb.m4 # -# Rebuild this file with `make ci-base.debiansid.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=debian:sid FROM ${from} diff --git a/scripts/docker/build/rocky10/Dockerfile b/scripts/docker/build/rocky10/Dockerfile index a779aa094f4..9f6000fc02b 100644 --- a/scripts/docker/build/rocky10/Dockerfile +++ b/scripts/docker/build/rocky10/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for rocky10 -# from scripts/docker/m4/docker.rpm.m4 +# from scripts/docker/m4/service.rpm.m4 # -# Rebuild this file with `make docker.rocky10.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=rockylinux/rockylinux:10 FROM ${from} AS build diff --git a/scripts/docker/build/rocky10/Dockerfile.cb b/scripts/docker/build/rocky10/Dockerfile.cb index 4f1aa478045..afe6261d90c 100644 --- a/scripts/docker/build/rocky10/Dockerfile.cb +++ b/scripts/docker/build/rocky10/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for rocky10 # from scripts/docker/m4/crossbuild.rpm.m4 # -# Rebuild this file with `make crossbuild.rocky10.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=rockylinux/rockylinux:10 FROM ${from} AS build diff --git a/scripts/docker/build/rocky10/Dockerfile.ci b/scripts/docker/build/rocky10/Dockerfile.ci index c5939831395..87279d56dd8 100644 --- a/scripts/docker/build/rocky10/Dockerfile.ci +++ b/scripts/docker/build/rocky10/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for rocky10 -# from scripts/docker/m4/ci-base.rpm.m4 +# from scripts/docker/m4/ci.rpm.m4 # -# Rebuild this file with `make ci-base.rocky10.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=rockylinux/rockylinux:10 FROM ${from} diff --git a/scripts/docker/build/rocky9/Dockerfile b/scripts/docker/build/rocky9/Dockerfile index 8f933ad27cb..14f1b3b339f 100644 --- a/scripts/docker/build/rocky9/Dockerfile +++ b/scripts/docker/build/rocky9/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for rocky9 -# from scripts/docker/m4/docker.rpm.m4 +# from scripts/docker/m4/service.rpm.m4 # -# Rebuild this file with `make docker.rocky9.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=rockylinux/rockylinux:9 FROM ${from} AS build diff --git a/scripts/docker/build/rocky9/Dockerfile.cb b/scripts/docker/build/rocky9/Dockerfile.cb index 2d90bbf4235..0a955f4830f 100644 --- a/scripts/docker/build/rocky9/Dockerfile.cb +++ b/scripts/docker/build/rocky9/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for rocky9 # from scripts/docker/m4/crossbuild.rpm.m4 # -# Rebuild this file with `make crossbuild.rocky9.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=rockylinux/rockylinux:9 FROM ${from} AS build diff --git a/scripts/docker/build/rocky9/Dockerfile.ci b/scripts/docker/build/rocky9/Dockerfile.ci index 86fbcbb52f4..b57b6a81fdb 100644 --- a/scripts/docker/build/rocky9/Dockerfile.ci +++ b/scripts/docker/build/rocky9/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for rocky9 -# from scripts/docker/m4/ci-base.rpm.m4 +# from scripts/docker/m4/ci.rpm.m4 # -# Rebuild this file with `make ci-base.rocky9.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=rockylinux/rockylinux:9 FROM ${from} diff --git a/scripts/docker/build/ubuntu22/Dockerfile b/scripts/docker/build/ubuntu22/Dockerfile index 2b3727aa35e..8483c82ddeb 100644 --- a/scripts/docker/build/ubuntu22/Dockerfile +++ b/scripts/docker/build/ubuntu22/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for ubuntu22 -# from scripts/docker/m4/docker.deb.m4 +# from scripts/docker/m4/service.deb.m4 # -# Rebuild this file with `make docker.ubuntu22.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=ubuntu:22.04 FROM ${from} AS build diff --git a/scripts/docker/build/ubuntu22/Dockerfile.cb b/scripts/docker/build/ubuntu22/Dockerfile.cb index 07b02cd1bdc..613b78358b2 100644 --- a/scripts/docker/build/ubuntu22/Dockerfile.cb +++ b/scripts/docker/build/ubuntu22/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for ubuntu22 # from scripts/docker/m4/crossbuild.deb.m4 # -# Rebuild this file with `make crossbuild.ubuntu22.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=ubuntu:22.04 FROM ${from} AS build diff --git a/scripts/docker/build/ubuntu22/Dockerfile.ci b/scripts/docker/build/ubuntu22/Dockerfile.ci index bf88068067d..b4b1cbd0945 100644 --- a/scripts/docker/build/ubuntu22/Dockerfile.ci +++ b/scripts/docker/build/ubuntu22/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for ubuntu22 -# from scripts/docker/m4/ci-base.deb.m4 +# from scripts/docker/m4/ci.deb.m4 # -# Rebuild this file with `make ci-base.ubuntu22.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=ubuntu:22.04 FROM ${from} diff --git a/scripts/docker/build/ubuntu24/Dockerfile b/scripts/docker/build/ubuntu24/Dockerfile index 176fe1b3bc1..3bdfb0d142a 100644 --- a/scripts/docker/build/ubuntu24/Dockerfile +++ b/scripts/docker/build/ubuntu24/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for ubuntu24 -# from scripts/docker/m4/docker.deb.m4 +# from scripts/docker/m4/service.deb.m4 # -# Rebuild this file with `make docker.ubuntu24.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=ubuntu:24.04 FROM ${from} AS build diff --git a/scripts/docker/build/ubuntu24/Dockerfile.cb b/scripts/docker/build/ubuntu24/Dockerfile.cb index 90d2d8e23d6..2f3903e7a24 100644 --- a/scripts/docker/build/ubuntu24/Dockerfile.cb +++ b/scripts/docker/build/ubuntu24/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for ubuntu24 # from scripts/docker/m4/crossbuild.deb.m4 # -# Rebuild this file with `make crossbuild.ubuntu24.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=ubuntu:24.04 FROM ${from} AS build diff --git a/scripts/docker/build/ubuntu24/Dockerfile.ci b/scripts/docker/build/ubuntu24/Dockerfile.ci index 72102d286c5..aa2131e990b 100644 --- a/scripts/docker/build/ubuntu24/Dockerfile.ci +++ b/scripts/docker/build/ubuntu24/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for ubuntu24 -# from scripts/docker/m4/ci-base.deb.m4 +# from scripts/docker/m4/ci.deb.m4 # -# Rebuild this file with `make ci-base.ubuntu24.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=ubuntu:24.04 FROM ${from} diff --git a/scripts/docker/build/ubuntu26/Dockerfile b/scripts/docker/build/ubuntu26/Dockerfile index f6ec852f50f..18c985cec97 100644 --- a/scripts/docker/build/ubuntu26/Dockerfile +++ b/scripts/docker/build/ubuntu26/Dockerfile @@ -1,7 +1,7 @@ # Auto generated for ubuntu26 -# from scripts/docker/m4/docker.deb.m4 +# from scripts/docker/m4/service.deb.m4 # -# Rebuild this file with `make docker.ubuntu26.regen` +# Rebuild this file with `make docker.service.regen` # ARG from=ubuntu:26.04 FROM ${from} AS build diff --git a/scripts/docker/build/ubuntu26/Dockerfile.cb b/scripts/docker/build/ubuntu26/Dockerfile.cb index 4bf2cd41ed0..ce858bcefd8 100644 --- a/scripts/docker/build/ubuntu26/Dockerfile.cb +++ b/scripts/docker/build/ubuntu26/Dockerfile.cb @@ -1,7 +1,7 @@ # Auto generated for ubuntu26 # from scripts/docker/m4/crossbuild.deb.m4 # -# Rebuild this file with `make crossbuild.ubuntu26.regen` +# Rebuild this file with `make docker.crossbuild.regen` # ARG from=ubuntu:26.04 FROM ${from} AS build diff --git a/scripts/docker/build/ubuntu26/Dockerfile.ci b/scripts/docker/build/ubuntu26/Dockerfile.ci index 31a2a94c8aa..89cc85a0a98 100644 --- a/scripts/docker/build/ubuntu26/Dockerfile.ci +++ b/scripts/docker/build/ubuntu26/Dockerfile.ci @@ -1,7 +1,7 @@ # Auto generated for ubuntu26 -# from scripts/docker/m4/ci-base.deb.m4 +# from scripts/docker/m4/ci.deb.m4 # -# Rebuild this file with `make ci-base.ubuntu26.regen` +# Rebuild this file with `make docker.ci.regen` # ARG from=ubuntu:26.04 FROM ${from} diff --git a/scripts/docker/crossbuild.mk b/scripts/docker/crossbuild.mk index f9c7ed8dddd..910fd0eb477 100644 --- a/scripts/docker/crossbuild.mk +++ b/scripts/docker/crossbuild.mk @@ -118,15 +118,15 @@ crossbuild.distclean: $(foreach IMG,${CB_IMAGES},crossbuild.${IMG}.distclean) # Regenerate all Dockerfile.cb files from m4 templates. Depends on # the file targets directly; no per-image phony aliases. # -.PHONY: crossbuild.regen crossbuild.regen.check -crossbuild.regen: $(foreach IMG,${CB_IMAGES},$(DT)/${IMG}/Dockerfile.cb) +.PHONY: docker.crossbuild.regen docker.crossbuild.regen.check +docker.crossbuild.regen: $(foreach IMG,${CB_IMAGES},$(DT)/${IMG}/Dockerfile.cb) # # Verify every committed Dockerfile.cb matches a fresh render of its # m4 source. Fails with a diff if a contributor edited the m4 but # forgot to regen+commit. # -crossbuild.regen.check: +docker.crossbuild.regen.check: @failed=0; for IMG in $(CB_IMAGES); do \ tmp=$$(mktemp); \ m4 -I $(CB_DIR)/m4 -D D_NAME=$$IMG -D D_TYPE=crossbuild $(DOCKER_TMPL) > $$tmp; \ @@ -135,7 +135,7 @@ crossbuild.regen.check: fi; \ rm $$tmp; \ done; \ - [ $$failed -eq 0 ] || { echo; echo "Run 'make crossbuild.regen' and commit the result."; exit 1; } + [ $$failed -eq 0 ] || { echo; echo "Run 'make docker.crossbuild.regen' and commit the result."; exit 1; } # diff --git a/scripts/docker/docker.mk b/scripts/docker/docker.mk index d660cec584f..3c13c3383b5 100644 --- a/scripts/docker/docker.mk +++ b/scripts/docker/docker.mk @@ -73,8 +73,8 @@ docker.help: @echo " docker - build all images" @echo " docker.common - build and test common images" @echo " docker.info - list images" - @echo " docker.regen - regenerate all production Dockerfiles" - @echo " ci-base.regen - regenerate all CI base Dockerfile.ci files" + @echo " docker.service.regen - regenerate all production Dockerfiles" + @echo " docker.ci.regen - regenerate all CI base Dockerfile.ci files" @echo "" @echo "Per-image targets:" @echo " docker.IMAGE.build - build image as $(D_IPREFIX)/" @@ -85,36 +85,36 @@ docker.help: # Regenerate all Dockerfiles from m4 templates. Both bundles depend # on the file targets directly; no per-image phony aliases. # -.PHONY: docker.regen ci-base.regen docker.regen.check ci-base.regen.check -docker.regen: $(foreach IMG,${IMAGES},$(DT)/${IMG}/Dockerfile) -ci-base.regen: $(foreach IMG,${IMAGES},$(DT)/${IMG}/Dockerfile.ci) +.PHONY: docker.service.regen docker.ci.regen docker.service.regen.check docker.ci.regen.check +docker.service.regen: $(foreach IMG,${IMAGES},$(DT)/${IMG}/Dockerfile) +docker.ci.regen: $(foreach IMG,${IMAGES},$(DT)/${IMG}/Dockerfile.ci) # # Verify every committed Dockerfile / Dockerfile.ci matches a fresh # render of its m4 source. Fails with a diff if a contributor edited # the m4 but forgot to regen+commit. # -docker.regen.check: +docker.service.regen.check: @failed=0; for IMG in $(IMAGES); do \ tmp=$$(mktemp); \ - m4 -I $(CB_DIR)/m4 -D D_NAME=$$IMG -D D_TYPE=docker $(DOCKER_TMPL) > $$tmp; \ + m4 -I $(CB_DIR)/m4 -D D_NAME=$$IMG -D D_TYPE=service $(DOCKER_TMPL) > $$tmp; \ if ! diff -u $(DT)/$$IMG/Dockerfile $$tmp; then \ echo "OUT OF SYNC: $(DT)/$$IMG/Dockerfile"; failed=1; \ fi; \ rm $$tmp; \ done; \ - [ $$failed -eq 0 ] || { echo; echo "Run 'make docker.regen' and commit the result."; exit 1; } + [ $$failed -eq 0 ] || { echo; echo "Run 'make docker.service.regen' and commit the result."; exit 1; } -ci-base.regen.check: +docker.ci.regen.check: @failed=0; for IMG in $(IMAGES); do \ tmp=$$(mktemp); \ - m4 -I $(CB_DIR)/m4 -D D_NAME=$$IMG -D D_TYPE=ci-base $(DOCKER_TMPL) > $$tmp; \ + m4 -I $(CB_DIR)/m4 -D D_NAME=$$IMG -D D_TYPE=ci $(DOCKER_TMPL) > $$tmp; \ if ! diff -u $(DT)/$$IMG/Dockerfile.ci $$tmp; then \ echo "OUT OF SYNC: $(DT)/$$IMG/Dockerfile.ci"; failed=1; \ fi; \ rm $$tmp; \ done; \ - [ $$failed -eq 0 ] || { echo; echo "Run 'make ci-base.regen' and commit the result."; exit 1; } + [ $$failed -eq 0 ] || { echo; echo "Run 'make docker.ci.regen' and commit the result."; exit 1; } # # Define rules for building a particular image @@ -145,13 +145,13 @@ docker.${1}.build: # images that ci-deb.yml / ci-rpm.yml run their build jobs inside. # Both regen via the bundle targets above; no per-image variants. # -$(DT)/${1}/Dockerfile: $(DOCKER_TMPL) $(CB_DIR)/m4/docker.deb.m4 $(CB_DIR)/m4/docker.rpm.m4 $(M4_SHARED) +$(DT)/${1}/Dockerfile: $(DOCKER_TMPL) $(CB_DIR)/m4/service.deb.m4 $(CB_DIR)/m4/service.rpm.m4 $(M4_SHARED) ${Q}echo REGEN ${1} "->" $$@ - ${Q}m4 -I $(CB_DIR)/m4 -D D_NAME=${1} -D D_TYPE=docker $$< > $$@ + ${Q}m4 -I $(CB_DIR)/m4 -D D_NAME=${1} -D D_TYPE=service $$< > $$@ -$(DT)/${1}/Dockerfile.ci: $(DOCKER_TMPL) $(CB_DIR)/m4/ci-base.deb.m4 $(CB_DIR)/m4/ci-base.rpm.m4 $(M4_SHARED) +$(DT)/${1}/Dockerfile.ci: $(DOCKER_TMPL) $(CB_DIR)/m4/ci.deb.m4 $(CB_DIR)/m4/ci.rpm.m4 $(M4_SHARED) ${Q}echo REGEN ${1} "->" $$@ - ${Q}m4 -I $(CB_DIR)/m4 -D D_NAME=${1} -D D_TYPE=ci-base $$< > $$@ + ${Q}m4 -I $(CB_DIR)/m4 -D D_NAME=${1} -D D_TYPE=ci $$< > $$@ endef diff --git a/scripts/docker/m4/Dockerfile.m4 b/scripts/docker/m4/Dockerfile.m4 index d3594ea3a98..0e9cdef4847 100644 --- a/scripts/docker/m4/Dockerfile.m4 +++ b/scripts/docker/m4/Dockerfile.m4 @@ -8,7 +8,7 @@ dnl they use are different - see the m4 directories for each. dnl dnl Two macros must be defined for this template: dnl D_NAME - the OS codename, see the table below, e.g. debian11 -dnl D_TYPE - the type of template, 'docker' or 'crossbuild' +dnl D_TYPE - the type of template: 'service', 'ci' or 'crossbuild' dnl divert(`-1') changequote(`[', `]') @@ -37,7 +37,7 @@ divert[]dnl [#] Auto generated for D_NAME [#] from scripts/docker/m4/D_TYPE.PKG_TYPE.m4 [#] -[#] Rebuild this file with `make D_TYPE.D_NAME.regen` +[#] Rebuild this file with `make docker.D_TYPE.regen` [#] changequote([`], ['])dnl include(D_TYPE.PKG_TYPE.m4)dnl diff --git a/scripts/docker/m4/ci-base.deb.m4 b/scripts/docker/m4/ci.deb.m4 similarity index 100% rename from scripts/docker/m4/ci-base.deb.m4 rename to scripts/docker/m4/ci.deb.m4 diff --git a/scripts/docker/m4/ci-base.rpm.m4 b/scripts/docker/m4/ci.rpm.m4 similarity index 100% rename from scripts/docker/m4/ci-base.rpm.m4 rename to scripts/docker/m4/ci.rpm.m4 diff --git a/scripts/docker/m4/docker.deb.m4 b/scripts/docker/m4/service.deb.m4 similarity index 100% rename from scripts/docker/m4/docker.deb.m4 rename to scripts/docker/m4/service.deb.m4 diff --git a/scripts/docker/m4/docker.rpm.m4 b/scripts/docker/m4/service.rpm.m4 similarity index 100% rename from scripts/docker/m4/docker.rpm.m4 rename to scripts/docker/m4/service.rpm.m4