2 Commits

Author SHA1 Message Date
9aa0361c36 fix(rockylinux-8): init 2025-05-07 14:08:34 +02:00
9d219ab8a8 fix(archlinux): rename make targets 2025-05-07 13:56:43 +02:00
3 changed files with 76 additions and 27 deletions

View File

@ -33,7 +33,7 @@ RUN locale-gen en_US.UTF-8
# Install Ansible inventory file # Install Ansible inventory file
RUN mkdir --parents /etc/ansible 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 # Remove unnecessary getty and udev targets that result in high CPU usage when
# using multiple containers with molecule # 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 rm --recursive --force /lib/systemd/system/getty.target
VOLUME [ "/sys/fs/cgroup", "/tmp", "/run"] VOLUME [ "/sys/fs/cgroup", "/tmp", "/run"]
CMD [ "/lib/systemd/systemd" ]

20
Dockerfile.rockylinux8 Normal file
View File

@ -0,0 +1,20 @@
FROM docker.io/library/rockylinux:8
RUN dnf update --assumeyes && \
dnf install --assumeyes epel-release && \
dnf install --assumeyes ansible && \
dnf remove --assumeyes epel-release && \
dnf install --assumeyes bash-completion sudo && \
dnf clean all
# Install Ansible inventory file
RUN mkdir --parents /etc/ansible
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
# (https://github.com/ansible/molecule/issues/1104)
RUN rm --recursive --force /lib/systemd/system/systemd*udev* && \
rm --recursive --force /lib/systemd/system/getty.target
VOLUME [ "/sys/fs/cgroup", "/tmp", "/run"]

View File

@ -3,41 +3,71 @@
# container runtime. This is needed to start and run a container image. # container runtime. This is needed to start and run a container image.
CONTAINER_RUNTIME?=$(shell which podman) CONTAINER_RUNTIME?=$(shell which podman)
# CONTAINER_IMAGE # ArchLinux
# Defines the name of the new container to be built using several variables. ANSIBLE_ARCH_IMAGE_REGISTRY_HOST?=git.cryptic.systems
BUILD_IMAGE_REGISTRY_HOST?=git.cryptic.systems ANSIBLE_ARCH_IMAGE_REGISTRY_USER?=volker.raschek
BUILD_IMAGE_REGISTRY_USER?=volker.raschek ANSIBLE_ARCH_IMAGE_NAMESPACE?=${ANSIBLE_ARCH_IMAGE_REGISTRY_USER}
BUILD_IMAGE_NAMESPACE?=${BUILD_IMAGE_REGISTRY_USER} ANSIBLE_ARCH_IMAGE_REPOSITORY:=ansible
BUILD_IMAGE_REPOSITORY:=ansible-archlinux ANSIBLE_ARCH_IMAGE_VERSION?=latest
BUILD_IMAGE_VERSION?=latest ANSIBLE_ARCH_IMAGE_VERSION_SUFFIX=arch-linux
BUILD_IMAGE_FULLY_QUALIFIED=${BUILD_IMAGE_REGISTRY_HOST}/${BUILD_IMAGE_NAMESPACE}/${BUILD_IMAGE_REPOSITORY}:${BUILD_IMAGE_VERSION} 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_IMAGE_UNQUALIFIED=${BUILD_IMAGE_NAMESPACE}/${BUILD_IMAGE_REPOSITORY}:${BUILD_IMAGE_VERSION}
# BUILD CONTAINER IMAGE # RockyLinux
ANSIBLE_RL8_IMAGE_REGISTRY_HOST?=git.cryptic.systems
ANSIBLE_RL8_IMAGE_REGISTRY_USER?=volker.raschek
ANSIBLE_RL8_IMAGE_NAMESPACE?=${ANSIBLE_RL8_IMAGE_REGISTRY_USER}
ANSIBLE_RL8_IMAGE_REPOSITORY:=ansible
ANSIBLE_RL8_IMAGE_VERSION?=latest
ANSIBLE_RL8_IMAGE_VERSION_SUFFIX=rockylinux-8
ANSIBLE_RL8_IMAGE_FULLY_QUALIFIED=${ANSIBLE_RL8_IMAGE_REGISTRY_HOST}/${ANSIBLE_RL8_IMAGE_NAMESPACE}/${ANSIBLE_RL8_IMAGE_REPOSITORY}:${ANSIBLE_RL8_IMAGE_VERSION}-${ANSIBLE_RL8_IMAGE_VERSION_SUFFIX}
# BUILD ANSIBLE ARCHLINUX CONTAINER IMAGE
# ============================================================================== # ==============================================================================
PHONY:=container-image/build PHONY:=container-image/build/arch-linux
container-image/build: container-image/build/arch-linux:
${CONTAINER_RUNTIME} build \ ${CONTAINER_RUNTIME} build \
--file Dockerfile \ --file Dockerfile.archlinux \
--no-cache \ --no-cache \
--pull \ --pull \
--tag ${BUILD_IMAGE_FULLY_QUALIFIED} \ --tag ${ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED} \
--tag ${BUILD_IMAGE_UNQUALIFIED} \
. .
# DELETE CONTAINER IMAGE # DELETE ANSIBLE ARCHLINUX CONTAINER IMAGE
# ============================================================================== # ==============================================================================
PHONY:=container-image/delete PHONY:=container-image/delete/arch-linux
container-image/delete: container-image/delete/arch-linux:
- ${CONTAINER_RUNTIME} image rm ${BUILD_IMAGE_FULLY_QUALIFIED} ${BUILD_IMAGE_UNQUALIFIED} - ${CONTAINER_RUNTIME} image rm ${ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED}
- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULLY_QUALIFIED}
# PUSH CONTAINER IMAGE # PUSH ANSIBLE ARCHLINUX CONTAINER IMAGE
# ============================================================================== # ==============================================================================
PHONY+=container-image/push PHONY+=container-image/push/arch-linux
container-image/push: container-image/push/arch-linux:
echo ${BUILD_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${BUILD_IMAGE_REGISTRY_HOST} --username ${BUILD_IMAGE_REGISTRY_USER} --password-stdin 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 ${BUILD_IMAGE_FULLY_QUALIFIED} ${CONTAINER_RUNTIME} push ${ANSIBLE_ARCH_IMAGE_FULLY_QUALIFIED}
# BUILD ANSIBLE RL8 CONTAINER IMAGE
# ==============================================================================
PHONY:=container-image/build/rocky-linux-8
container-image/build/rocky-linux-8:
${CONTAINER_RUNTIME} build \
--file Dockerfile.rockylinux8 \
--no-cache \
--pull \
--tag ${ANSIBLE_RL8_IMAGE_FULLY_QUALIFIED} \
.
# DELETE ANSIBLE RL8 CONTAINER IMAGE
# ==============================================================================
PHONY:=container-image/delete/rocky-linux-8
container-image/delete/rocky-linux-8:
- ${CONTAINER_RUNTIME} image rm ${ANSIBLE_RL8_IMAGE_FULLY_QUALIFIED}
# PUSH ANSIBLE RL8 CONTAINER IMAGE
# ==============================================================================
PHONY+=container-image/push/rocky-linux-8
container-image/push/rocky-linux-8:
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}
# PHONY # PHONY
# ============================================================================== # ==============================================================================