Change terminology to local for local docker image creation

There was some confusion about what was meant by `host` in the various
target names, and in the documentation `local` seemed like a better
term. Changed all make and bake targets to use the `local-image`
instead of `host-image` or `image-host`.

Author: ajuckel

Makefile.build.mk

@@ -35,15 +35,15 @@ $(BASE_BINARY_PATH)-%: GOARCH=$(lastword $(subst -, ,$(basename $*)))
 $(BASE_BINARY_PATH)-%:
 	GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build -trimpath -ldflags "$(GO_LDFLAGS)" -o $@
 
-.PHONY: runner-image-host
-runner-image-host: export HOST_ARCH ?= $(shell go env GOARCH)
-runner-image-host: export HOST_FLAVOR ?= alpine-3.21
-runner-image-host: export RUNNER_IMAGES_VERSION ?= $(shell grep "RUNNER_IMAGES_VERSION:" .gitlab/ci/_common.gitlab-ci.yml | awk -F': ' '{ print $$2 }' | tr -d '"')
-runner-image-host: runner-bin-linux
-	cd dockerfiles/runner && docker buildx bake --progress plain host-image
-
-.PHONY: runner-and-helper-image-host
-runner-and-helper-image-host: runner-image-host helper-image-host
+.PHONY: runner-local-image
+runner-local-image: export LOCAL_ARCH ?= $(shell go env GOARCH)
+runner-local-image: export LOCAL_FLAVOR ?= alpine-3.21
+runner-local-image: export RUNNER_IMAGES_VERSION ?= $(shell grep "RUNNER_IMAGES_VERSION:" .gitlab/ci/_common.gitlab-ci.yml | awk -F': ' '{ print $$2 }' | tr -d '"')
+runner-local-image: runner-bin-linux
+	cd dockerfiles/runner && docker buildx bake --progress plain local-image
+
+.PHONY: runner-and-helper-local-image
+runner-and-helper-local-image: runner-local-image helper-local-image
 
 out/runner-images: TARGETS ?= ubuntu alpine
 out/runner-images:

Makefile.runner_helper.mk

@@ -45,12 +45,12 @@ helper-bin-fips: ${BASE_BINARY_PATH}.linux-amd64-fips
 helper-images: $(BINARIES)
 helper-images: out/helper-images
 
-.PHONY: helper-image-host
-helper-image-host: export HOST_ARCH ?= $(shell go env GOARCH)
-helper-image-host: export HOST_FLAVOR ?= alpine-3.21
-helper-image-host: export RUNNER_IMAGES_VERSION ?= $(shell grep "RUNNER_IMAGES_VERSION:" .gitlab/ci/_common.gitlab-ci.yml | awk -F': ' '{ print $$2 }' | tr -d '"')
-helper-image-host: helper-bin-linux
-	cd dockerfiles/runner-helper && docker buildx bake --progress plain host-image
+.PHONY: helper-local-image
+helper-local-image: export LOCAL_ARCH ?= $(shell go env GOARCH)
+helper-local-image: export LOCAL_FLAVOR ?= alpine-3.21
+helper-local-image: export RUNNER_IMAGES_VERSION ?= $(shell grep "RUNNER_IMAGES_VERSION:" .gitlab/ci/_common.gitlab-ci.yml | awk -F': ' '{ print $$2 }' | tr -d '"')
+helper-local-image: helper-bin-linux
+	cd dockerfiles/runner-helper && docker buildx bake --progress plain local-image
 
 # Make sure the fips target is first since it's less general
 ${BASE_BINARY_PATH}.linux-amd64-fips: GOOS=linux

dockerfiles/runner-helper/docker-bake.hcl

@@ -6,11 +6,11 @@ variable "RUNNER_IMAGES_VERSION" {
   default = "0.0.0"
 }
 
-variable "HOST_ARCH" {
+variable "LOCAL_ARCH" {
   default = "amd64"
 }
 
-variable "HOST_FLAVOR" {
+variable "LOCAL_FLAVOR" {
   default = "alpine-3.21"
 }
 
@@ -135,14 +135,14 @@ target "windows" {
 }
 
 # Used for local testing, creates the gitlab-runner-helper:local image in the user's current docker context
-target "host-image" {
+target "local-image" {
   inherits = ["base"]
 
   args = {
-    BASE_IMAGE = "${RUNNER_IMAGES_REGISTRY}/runner-helper:${RUNNER_IMAGES_VERSION}-${HOST_FLAVOR}"
+    BASE_IMAGE = "${RUNNER_IMAGES_REGISTRY}/runner-helper:${RUNNER_IMAGES_VERSION}-${LOCAL_FLAVOR}"
   }
 
-  platforms = ["linux/${HOST_ARCH}"]
+  platforms = ["linux/${LOCAL_ARCH}"]
   output    = ["type=docker"]
   tags      = ["gitlab-runner-helper:local"]
 }

dockerfiles/runner/docker-bake.hcl

@@ -6,11 +6,11 @@ variable "RUNNER_IMAGES_VERSION" {
   default = "0.0.0"
 }
 
-variable "HOST_ARCH" {
+variable "LOCAL_ARCH" {
   default = "amd64"
 }
 
-variable "HOST_FLAVOR" {
+variable "LOCAL_FLAVOR" {
   default = "alpine-3.21"
 }
 
@@ -63,14 +63,14 @@ target "alpine" {
 }
 
 # Used for local testing, creates the gitlab-runner:local image in the user's current docker context
-target "host-image" {
+target "local-image" {
   inherits = ["base"]
 
   args = {
-    BASE_IMAGE = "${RUNNER_IMAGES_REGISTRY}/runner:${RUNNER_IMAGES_VERSION}-${HOST_FLAVOR}"
+    BASE_IMAGE = "${RUNNER_IMAGES_REGISTRY}/runner:${RUNNER_IMAGES_VERSION}-${LOCAL_FLAVOR}"
   }
 
-  platforms = ["linux/${HOST_ARCH}"]
+  platforms = ["linux/${LOCAL_ARCH}"]
   output    = ["type=docker"]
   tags      = ["gitlab-runner:local"]
 }

docs/development/index.md

@@ -350,11 +350,13 @@ To use the debugger, make sure to remove the last two flags (`-s -w`).
 You can build the runner and/or helper as a local docker image with:
 
 ```shell
-make runner-image-host              # build only gitlab-runner:local
-make helper-image-host              # build only gitlab-runner-helper:local
-make runner-and-helper-image-host   # build both
+make runner-local-image              # build only gitlab-runner:local
+make helper-local-image              # build only gitlab-runner-helper:local
+make runner-and-helper-local-image   # build both
 ```
 
+After the build completes, the images are ready to be used locally.
+
 ```shell
 docker image ls
 REPOSITORY                                TAG        IMAGE ID       CREATED         SIZE
@@ -369,7 +371,7 @@ to set your docker context appropriately before building the images. For example
 
 ```shell
 eval $(minikube docker-env)
-make runner-and-helper-image-host
+make runner-and-helper-local-image
 ```
 
 ## 9. Install optional tools