From 2d016927c4736d7f3093d4dee6678966c2edcb71 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 8 Dec 2023 20:31:48 -0500 Subject: [PATCH] - update all files to use ansible and ansible-core from pip for version consistancy - debian 11 should now build --- build/Containerfile.debian11 | 5 ++++- build/Containerfile.debian12 | 5 ++++- build/Containerfile.fedora39 | 9 +++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build/Containerfile.debian11 b/build/Containerfile.debian11 index 669b206..bf09ec1 100644 --- a/build/Containerfile.debian11 +++ b/build/Containerfile.debian11 @@ -7,11 +7,14 @@ RUN rm /etc/localtime \ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts +COPY python/requirements.txt /tmp/requirements.txt RUN apt update \ && apt dist-upgrade -y \ && apt autoremove --purge -y \ - && apt install -y ansible-core ansible-lint git + && apt install -y python3-pip git \ + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml diff --git a/build/Containerfile.debian12 b/build/Containerfile.debian12 index 58dcb5a..5ccd669 100644 --- a/build/Containerfile.debian12 +++ b/build/Containerfile.debian12 @@ -7,11 +7,14 @@ RUN rm /etc/localtime \ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts +COPY python/requirements.txt /tmp/requirements.txt RUN apt update \ && apt dist-upgrade -y \ && apt autoremove --purge -y \ - && apt install -y ansible-core ansible-lint git + && apt install -y python3-pip git \ + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml diff --git a/build/Containerfile.fedora39 b/build/Containerfile.fedora39 index 2088107..7dba5eb 100644 --- a/build/Containerfile.fedora39 +++ b/build/Containerfile.fedora39 @@ -8,11 +8,12 @@ RUN mkdir -p /root/.ssh COPY conf/ssh_config /root/.ssh/config COPY conf/hosts /etc/hosts COPY conf/dnf.conf /etc/dnf/dnf.conf -# COPY python/requirements.txt /tmp/requirements.txt +COPY python/requirements.txt /tmp/requirements.txt -RUN dnf install -y python3-pip git ansible-core python3-ansible-lint -# && pip install pip --upgrade \ -# && pip install -r /tmp/requirements.txt +# RUN dnf install -y python3-pip git ansible-core python3-ansible-lint +RUN dnf install -y python3-pip git + && pip install pip --upgrade \ + && pip install -r /tmp/requirements.txt COPY ansible/ansible-check.yml /tmp/ansible-check.yml