Rename containerfiles

Author: pmtk

.github/actions/build/action.yaml

@@ -47,7 +47,7 @@ inputs:
     type: string
     description: RPM builder image to use
     required: false
-    default: microshift-okd-builder
+    default: rpm-local-builder
 
 runs:
   using: "composite"
@@ -62,11 +62,11 @@ runs:
 
     - name: Prepare the build and run environment
       # Skip if the rpm-builder is overridden - release.yaml builds RPMs using COPR.
-      if: inputs.rpm-builder == 'microshift-okd-builder'
+      if: inputs.rpm-builder == 'rpm-local-builder'
       uses: ./.github/actions/prebuild
 
     - name: Build MicroShift RPMs
-      if: inputs.rpm-builder == 'microshift-okd-builder'
+      if: inputs.rpm-builder == 'rpm-local-builder'
       shell: bash
       run: |
         # See https://github.com/microshift-io/microshift/blob/main/docs/build.md

.github/workflows/release.yaml

@@ -54,7 +54,7 @@ jobs:
           ushift-branch: ${{ inputs.ushift-branch }}
           okd-version-tag: ${{ inputs.okd-version-tag }}
           build: bootc-image
-          rpm-builder: microshift-copr-builder
+          rpm-builder: rpm-copr-builder
 
       # - name: Build MicroShift bootc container image
       #   if: contains(fromJSON('["all", "bootc-image"]'), inputs.build)

Makefile

@@ -20,7 +20,7 @@ ISOLATED_NETWORK ?= 0
 
 # Internal variables
 SHELL := /bin/bash
-BUILDER_IMAGE ?= microshift-okd-builder
+BUILDER_IMAGE ?= rpm-local-builder
 USHIFT_IMAGE := microshift-okd
 LVM_DISK := /var/lib/microshift-okd/lvmdisk.image
 VG_NAME := myvg1
@@ -60,13 +60,13 @@ all:
 
 .PHONY: rpm
 rpm:
-	@echo "Building the MicroShift builder image"
+	@echo "Building the MicroShift RPMs"
 	sudo podman build \
         -t "${BUILDER_IMAGE}" \
         --ulimit nofile=524288:524288 \
         --build-arg USHIFT_BRANCH="${USHIFT_BRANCH}" \
         --build-arg OKD_VERSION_TAG="${OKD_VERSION_TAG}" \
-        -f packaging/microshift-builder.Containerfile .
+        -f packaging/rpm-local-builder.Containerfile .
 
 	@echo "Extracting the MicroShift RPMs"
 	outdir="$${RPM_OUTDIR:-$$(mktemp -d /tmp/microshift-rpms-XXXXXX)}" && \
@@ -108,7 +108,7 @@ image:
     	--env WITH_TOPOLVM="${WITH_TOPOLVM}" \
     	--env WITH_OLM="${WITH_OLM}" \
     	--env EMBED_CONTAINER_IMAGES="${EMBED_CONTAINER_IMAGES}" \
-        -f packaging/microshift-runner.Containerfile .
+        -f packaging/bootc.Containerfile .
 
 # Notes:
 # - An isolated network is created if the ISOLATED_NETWORK environment variable is set
@@ -168,6 +168,7 @@ clean-all:
 	$(MAKE) clean
 	sudo podman rmi -f "${USHIFT_IMAGE}" || true
 	sudo podman rmi -f "${BUILDER_IMAGE}" || true
+	sudo podman rmi -f "${COPR_BUILDER_IMAGE}" || true
 
 .PHONY: check
 check: _hadolint _shellcheck

packaging/microshift-runner.Containerfile packaging/bootc.Containerfilepackaging/microshift-runner.Containerfile renamed to packaging/bootc.Containerfile

@@ -4,20 +4,20 @@ COPR_BUILDS ?=
 COPR_REPO_NAME ?= pmtk0/test123
 
 COPR_SECRET_NAME := copr-cfg
-COPR_BUILDER_IMAGE := microshift-copr-builder
+COPR_BUILDER_IMAGE := rpm-copr-builder
 COPR_CLI_IMAGE := localhost/copr-cli:latest
 
 .PHONY: copr-rpm
 copr-rpm:
-	@echo "Building the MicroShift RPMs for COPR"
+	@echo "Building the MicroShift RPMs using the COPR build service"
 	sudo podman build \
         --tag "${COPR_BUILDER_IMAGE}" \
 		--secret id=${COPR_SECRET_NAME},src=${COPR_CONFIG} \
         --ulimit nofile=524288:524288 \
         --build-arg USHIFT_BRANCH="${USHIFT_BRANCH}" \
         --build-arg OKD_VERSION_TAG="${OKD_VERSION_TAG}" \
 		--env COPR_REPO_NAME="${COPR_REPO_NAME}" \
-        --file packaging/microshift-copr.Containerfile .
+        --file packaging/rpm-copr-builder.Containerfile .
 
 	@echo "Extracting the MicroShift RPMs"
 	outdir="$${RPM_OUTDIR:-$$(mktemp -d /tmp/microshift-rpms-XXXXXX)}" && \