From 9aa0361c363429b36a2eea938f7725c1087397fd Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Wed, 7 May 2025 14:08:34 +0200 Subject: [PATCH] fix(rockylinux-8): init --- Dockerfile.rockylinux8 | 20 ++++++++++++++++++++ Makefile | 37 ++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 Dockerfile.rockylinux8 diff --git a/Dockerfile.rockylinux8 b/Dockerfile.rockylinux8 new file mode 100644 index 0000000..4235070 --- /dev/null +++ b/Dockerfile.rockylinux8 @@ -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"] \ No newline at end of file diff --git a/Makefile b/Makefile index 6395ce3..a57dca9 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,15 @@ 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} +# 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/arch-linux @@ -38,29 +47,27 @@ container-image/push/arch-linux: # BUILD ANSIBLE RL8 CONTAINER IMAGE # ============================================================================== -PHONY:=container-image/build -container-image/build: +PHONY:=container-image/build/rocky-linux-8 +container-image/build/rocky-linux-8: ${CONTAINER_RUNTIME} build \ - --file Dockerfile \ + --file Dockerfile.rockylinux8 \ --no-cache \ --pull \ - --tag ${BUILD_IMAGE_FULLY_QUALIFIED} \ - --tag ${BUILD_IMAGE_UNQUALIFIED} \ + --tag ${ANSIBLE_RL8_IMAGE_FULLY_QUALIFIED} \ . -# DELETE CONTAINER IMAGE +# DELETE ANSIBLE RL8 CONTAINER IMAGE # ============================================================================== -PHONY:=container-image/delete -container-image/delete: - - ${CONTAINER_RUNTIME} image rm ${BUILD_IMAGE_FULLY_QUALIFIED} ${BUILD_IMAGE_UNQUALIFIED} - - ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULLY_QUALIFIED} +PHONY:=container-image/delete/rocky-linux-8 +container-image/delete/rocky-linux-8: + - ${CONTAINER_RUNTIME} image rm ${ANSIBLE_RL8_IMAGE_FULLY_QUALIFIED} -# PUSH CONTAINER IMAGE +# PUSH ANSIBLE RL8 CONTAINER IMAGE # ============================================================================== -PHONY+=container-image/push -container-image/push: - echo ${BUILD_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${BUILD_IMAGE_REGISTRY_HOST} --username ${BUILD_IMAGE_REGISTRY_USER} --password-stdin - ${CONTAINER_RUNTIME} push ${BUILD_IMAGE_FULLY_QUALIFIED} +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 # ==============================================================================