fixup from last release

This commit is contained in:
Tobias Trabelsi 2020-10-31 18:54:14 +01:00
parent 58c2f3da3f
commit 74ced09e91
4 changed files with 12 additions and 4 deletions

View File

@ -1,7 +1,7 @@
FROM centos:7 FROM centos:7
RUN yum -y install epel-release \ RUN yum -y install epel-release \
&& yum -y install ansible git curl \ && yum -y install ansible git curl python-firewall \
&& curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \ && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
&& chmod +rx /usr/local/bin/goss \ && chmod +rx /usr/local/bin/goss \
&& yum clean headers \ && yum clean headers \

View File

@ -4,6 +4,8 @@ RUN dnf -y install python3-pip &&\
dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm &&\ dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm &&\
dnf install -y --enablerepo epel-playground ansible curl \ dnf install -y --enablerepo epel-playground ansible curl \
&& curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \ && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
&& chmod +rx /usr/local/bin/goss && chmod +rx /usr/local/bin/goss \
&& touch ~/.netrc && chmod og-rw ~/.netrc \
pip3 install firewall
CMD ["ansible-playbook", "--help"] CMD ["ansible-playbook", "--help"]

View File

@ -12,6 +12,7 @@ RUN apt-get -q update \
apt-utils \ apt-utils \
curl \ curl \
ansible \ ansible \
python \
&& curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \ && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
&& chmod +rx /usr/local/bin/goss \ && chmod +rx /usr/local/bin/goss \
&& apt-get clean && apt-get clean

View File

@ -11,11 +11,16 @@ RUN apt-get -q update \
git \ git \
apt-utils \ apt-utils \
curl \ curl \
ansible \ gnupg \
dirmngr \
&& curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \ && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
&& chmod +rx /usr/local/bin/goss \ && chmod +rx /usr/local/bin/goss \
&& apt-get clean \
&& pip3 install --upgrade pip && pip3 install --upgrade pip
RUN echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" >> /etc/apt/sources \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
&& apt-get -q update \
&& apt-get install -yq ansible \
&& apt-get clean
CMD ["ansible-playbook", "--help"] CMD ["ansible-playbook", "--help"]