diff --git a/dockerfile b/dockerfile index 9b9cd9e..1f922c8 100644 --- a/dockerfile +++ b/dockerfile @@ -3,6 +3,8 @@ FROM --platform=$TARGETPLATFORM python:3.11-bullseye # Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283 ENV LC_ALL en_US.UTF-8 +ENV DEBIAN_FRONTEND noninteractive + ENV ANSIBLE_PLAYBOOK_DIR=/etc/ansible/playbooks @@ -23,23 +25,29 @@ LABEL \ # org.opencontainers.image.version="{git tag}" - -# This Black Magic exists as libc-bin was being a turd and returning errors when trying to install git, ssh. -# see: https://askubuntu.com/questions/1339558/cant-build-dockerfile-for-arm64-due-to-libc-bin-segmentation-fault -# see: https://github.com/dcycle/prepare-docker-buildx/blob/09057fe4879e31ee780b9e69b87f41327ca8cd8e/example/Dockerfile#L8-L10 -RUN export DEBIAN_FRONTEND=noninteractive \ - && apt update \ - && apt --fix-broken install \ - && apt install -y libc-bin locales-all \ - && apt update \ - && apt install --reinstall --no-install-recommends -yq \ - openssh-client \ - git || true \ - && dpkg --purge --force-all libc-bin \ +RUN apt update \ + # SoF fixing dpkg ldconfig not found error + && cd /tmp \ + && apt-get download \ + libc-bin \ + && dpkg --extract ./libc-bin_*.deb /tmp/deb \ + && cp /tmp/deb/sbin/ldconfig /sbin/ \ + && rm -Rf /tmp/deb \ + && rm libc-bin_*.deb \ + && apt-get install --reinstall \ + libc-bin \ + # EoF fixing dpkg ldconfig not found error + # Set Locale to en_US as ansible requires a locale for it to function without chucking a tantrum!! + && apt install -y \ + locales \ + && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen \ + && apt list --upgradable \ + && apt upgrade --no-install-recommends -y \ && apt-get install --no-install-recommends -y \ openssh-client \ git \ - # End of Black Magic + sshpass \ && rm -rf /var/lib/apt/lists/* \ && mkdir -p /etc/ansible/roles \ && mkdir -p /etc/ansible/collections \ @@ -69,4 +77,5 @@ RUN ansible-galaxy collection install \ # ansible.posix.authorized_key for SSH ansible.posix \ # docker managment - community.docker \ No newline at end of file + community.docker \ + community.mysql \ No newline at end of file diff --git a/gitlab-ci b/gitlab-ci index d91605e..975de7a 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit d91605e3771781ad1d6ea88ec799d9261e1641af +Subproject commit 975de7aca210667d1e93d02a4036ca4ae70808ff diff --git a/includes/etc/ansible/playbooks b/includes/etc/ansible/playbooks index d6a8823..0973469 160000 --- a/includes/etc/ansible/playbooks +++ b/includes/etc/ansible/playbooks @@ -1 +1 @@ -Subproject commit d6a88239f9836dc737d273c97793f223111e728c +Subproject commit 097346982a268a28f8e3bc36f807db13fe562eb3 diff --git a/includes/etc/ansible/roles b/includes/etc/ansible/roles index e0788cc..5003f6e 160000 --- a/includes/etc/ansible/roles +++ b/includes/etc/ansible/roles @@ -1 +1 @@ -Subproject commit e0788ccdf5972d5ee63d4c47aba9a209e7e12f87 +Subproject commit 5003f6e83b0892968f1ff1c411662f21a90804e9