From 51cd432317033008967de19a1108d19743d2e8fb Mon Sep 17 00:00:00 2001 From: Alessandro Fael Garcia Date: Fri, 13 Apr 2018 15:53:19 -0700 Subject: [PATCH] Fix Dockerfiles * Install apt-transport-https depency in Debian based containers * Test different CMD instruction in CentOS 6 container --- tests/dockerfiles/Dockerfile.centos-6 | 2 +- tests/dockerfiles/Dockerfile.debian-jessie | 1 + tests/dockerfiles/Dockerfile.debian-stretch | 1 + tests/dockerfiles/Dockerfile.ubuntu-trusty | 1 + tests/dockerfiles/Dockerfile.ubuntu-xenial | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/dockerfiles/Dockerfile.centos-6 b/tests/dockerfiles/Dockerfile.centos-6 index 164d3cd..fef4a5e 100644 --- a/tests/dockerfiles/Dockerfile.centos-6 +++ b/tests/dockerfiles/Dockerfile.centos-6 @@ -9,4 +9,4 @@ RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts VOLUME ["/sys/fs/cgroup"] -CMD ["/usr/sbin/init"] +CMD ["/sbin/init"] diff --git a/tests/dockerfiles/Dockerfile.debian-jessie b/tests/dockerfiles/Dockerfile.debian-jessie index 8d38f0c..b63e28f 100644 --- a/tests/dockerfiles/Dockerfile.debian-jessie +++ b/tests/dockerfiles/Dockerfile.debian-jessie @@ -8,6 +8,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \ python-dev \ python-pip \ git \ + apt-transport-https && rm -rf /var/lib/apt/lists/* RUN pip install --upgrade setuptools && pip install ansible diff --git a/tests/dockerfiles/Dockerfile.debian-stretch b/tests/dockerfiles/Dockerfile.debian-stretch index ee2fbc7..8481241 100644 --- a/tests/dockerfiles/Dockerfile.debian-stretch +++ b/tests/dockerfiles/Dockerfile.debian-stretch @@ -9,6 +9,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \ python-pip \ git \ systemd \ + apt-transport-https && rm -rf /var/lib/apt/lists/* RUN pip install --upgrade setuptools && pip install ansible diff --git a/tests/dockerfiles/Dockerfile.ubuntu-trusty b/tests/dockerfiles/Dockerfile.ubuntu-trusty index c9687d2..3d3466a 100644 --- a/tests/dockerfiles/Dockerfile.ubuntu-trusty +++ b/tests/dockerfiles/Dockerfile.ubuntu-trusty @@ -5,6 +5,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y software-pro RUN apt-add-repository -y ppa:ansible/ansible && apt-get update && apt-get install -y \ git \ ansible \ + apt-transport-https && rm -rf /var/lib/apt/lists/* RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts diff --git a/tests/dockerfiles/Dockerfile.ubuntu-xenial b/tests/dockerfiles/Dockerfile.ubuntu-xenial index 2faaba1..d5457d3 100644 --- a/tests/dockerfiles/Dockerfile.ubuntu-xenial +++ b/tests/dockerfiles/Dockerfile.ubuntu-xenial @@ -5,6 +5,7 @@ RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y software-pro RUN apt-add-repository -y ppa:ansible/ansible && apt-get update && apt-get install -y \ git \ ansible \ + apt-transport-https && rm -rf /var/lib/apt/lists/* RUN echo "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts