From 9d219ab8a8dce288aa320309b151bffe447e14bc Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Wed, 7 May 2025 13:56:43 +0200
Subject: [PATCH] fix(archlinux): rename make targets

---
 Dockerfile => Dockerfile.archlinux |  3 +--
 Makefile                           | 43 +++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 12 deletions(-)
 rename Dockerfile => Dockerfile.archlinux (91%)

diff --git a/Dockerfile b/Dockerfile.archlinux
similarity index 91%
rename from Dockerfile
rename to Dockerfile.archlinux
index 3d9772d..8ff3bee 100644
--- a/Dockerfile
+++ b/Dockerfile.archlinux
@@ -33,7 +33,7 @@ RUN locale-gen en_US.UTF-8
 
 # Install Ansible inventory file
 RUN mkdir --parents /etc/ansible
-RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
+RUN echo -e "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
 
 # Remove unnecessary getty and udev targets that result in high CPU usage when
 # using multiple containers with molecule
@@ -42,4 +42,3 @@ RUN rm --recursive --force /lib/systemd/system/systemd*udev* && \
     rm --recursive --force /lib/systemd/system/getty.target
 
 VOLUME [ "/sys/fs/cgroup", "/tmp", "/run"]
-CMD [ "/lib/systemd/systemd" ]
diff --git a/Makefile b/Makefile
index a48decf..6395ce3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,40 @@
 # container runtime. This is needed to start and run a container image.
 CONTAINER_RUNTIME?=$(shell which podman)
 
-# CONTAINER_IMAGE
-# Defines the name of the new container to be built using several variables.
-BUILD_IMAGE_REGISTRY_HOST?=git.cryptic.systems
-BUILD_IMAGE_REGISTRY_USER?=volker.raschek
-BUILD_IMAGE_NAMESPACE?=${BUILD_IMAGE_REGISTRY_USER}
-BUILD_IMAGE_REPOSITORY:=ansible-archlinux
-BUILD_IMAGE_VERSION?=latest
-BUILD_IMAGE_FULLY_QUALIFIED=${BUILD_IMAGE_REGISTRY_HOST}/${BUILD_IMAGE_NAMESPACE}/${BUILD_IMAGE_REPOSITORY}:${BUILD_IMAGE_VERSION}
-BUILD_IMAGE_UNQUALIFIED=${BUILD_IMAGE_NAMESPACE}/${BUILD_IMAGE_REPOSITORY}:${BUILD_IMAGE_VERSION}
+# ArchLinux
+ANSIBLE_ARCH_IMAGE_REGISTRY_HOST?=git.cryptic.systems
+ANSIBLE_ARCH_IMAGE_REGISTRY_USER?=volker.raschek
+ANSIBLE_ARCH_IMAGE_NAMESPACE?=${ANSIBLE_ARCH_IMAGE_REGISTRY_USER}
+ANSIBLE_ARCH_IMAGE_REPOSITORY:=ansible
+ANSIBLE_ARCH_IMAGE_VERSION?=latest
+ANSIBLE_ARCH_IMAGE_VERSION_SUFFIX=arch-linux
+ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED=${ANSIBLE_ARCH_IMAGE_REGISTRY_HOST}/${ANSIBLE_ARCH_IMAGE_NAMESPACE}/${ANSIBLE_ARCH_IMAGE_REPOSITORY}:${ANSIBLE_ARCH_IMAGE_VERSION}-${ANSIBLE_ARCH_IMAGE_VERSION_SUFFIX}
 
-# BUILD CONTAINER IMAGE
+# BUILD ANSIBLE ARCHLINUX CONTAINER IMAGE
+# ==============================================================================
+PHONY:=container-image/build/arch-linux
+container-image/build/arch-linux:
+	${CONTAINER_RUNTIME} build \
+		--file Dockerfile.archlinux \
+		--no-cache \
+		--pull \
+		--tag ${ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED} \
+		.
+
+# DELETE ANSIBLE ARCHLINUX CONTAINER IMAGE
+# ==============================================================================
+PHONY:=container-image/delete/arch-linux
+container-image/delete/arch-linux:
+	- ${CONTAINER_RUNTIME} image rm ${ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED}
+
+# PUSH ANSIBLE ARCHLINUX CONTAINER IMAGE
+# ==============================================================================
+PHONY+=container-image/push/arch-linux
+container-image/push/arch-linux:
+	echo ${ANSIBLE_ARCH_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${ANSIBLE_ARCH_IMAGE_REGISTRY_HOST} --username ${ANSIBLE_ARCH_IMAGE_REGISTRY_USER} --password-stdin
+	${CONTAINER_RUNTIME} push ${ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED}
+
+# BUILD ANSIBLE RL8 CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/build
 container-image/build: