ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixing up Dockerfiles some more to get tests passing fully

Browse source
This commit is contained in:
James Cammarata 2016-03-04 09:16:10 -05:00
parent 2da2dc621b
commit 7f34705b0c
3 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/utils/docker/centos7/Dockerfile
View file

@ -33,9 +33,9 @@ RUN yum -y install \
python-pip \ python-pip \
python-setuptools \ python-setuptools \
python-virtualenv python-virtualenv
RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN /usr/bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
RUN mkdir /etc/ansible/ RUN mkdir /etc/ansible/
RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts RUN /usr/bin/echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
VOLUME /sys/fs/cgroup /run /tmp VOLUME /sys/fs/cgroup /run /tmp
ENV container=docker ENV container=docker
CMD ["/usr/sbin/init"] CMD ["/usr/sbin/init"]

37
test/utils/docker/ubuntu1404/Dockerfile
View file

@ -2,6 +2,7 @@ FROM ubuntu:trusty
RUN apt-get clean; apt-get update -y; RUN apt-get clean; apt-get update -y;
RUN apt-get install -y \ RUN apt-get install -y \
debianutils \ debianutils \
gawk \
git \ git \
locales \ locales \
make \ make \
@ -10,6 +11,35 @@ RUN apt-get install -y \
subversion \ subversion \
sudo \ sudo \
unzip unzip
# helpful things taken from the ubuntu-upstart Dockerfile:
# https://github.com/tianon/dockerfiles/blob/4d24a12b54b75b3e0904d8a285900d88d3326361/sbin-init/ubuntu/upstart/14.04/Dockerfile
ADD init-fake.conf /etc/init/fake-container-events.conf
# undo some leet hax of the base image
RUN rm /usr/sbin/policy-rc.d; \
rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl
# remove some pointless services
RUN /usr/sbin/update-rc.d -f ondemand remove; \
for f in \
/etc/init/u*.conf \
/etc/init/mounted-dev.conf \
/etc/init/mounted-proc.conf \
/etc/init/mounted-run.conf \
/etc/init/mounted-tmp.conf \
/etc/init/mounted-var.conf \
/etc/init/hostname.conf \
/etc/init/networking.conf \
/etc/init/tty*.conf \
/etc/init/plymouth*.conf \
/etc/init/hwclock*.conf \
/etc/init/module*.conf\
; do \
dpkg-divert --local --rename --add "$f"; \
done; \
echo '# /lib/init/fstab: cleared out for bare-bones Docker' > /lib/init/fstab
# end things from ubuntu-upstart Dockerfile
RUN apt-get install -y \ RUN apt-get install -y \
python-coverage \ python-coverage \
python-httplib2 \ python-httplib2 \
@ -22,9 +52,10 @@ RUN apt-get install -y \
python-setuptools \ python-setuptools \
python-virtualenv \ python-virtualenv \
python-yaml python-yaml
RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers RUN rm /etc/apt/apt.conf.d/docker-clean
RUN /bin/sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
RUN mkdir /etc/ansible/ RUN mkdir /etc/ansible/
RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts RUN /bin/echo -e "[local]\nlocalhost ansible_connection=local" > /etc/ansible/hosts
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
ENV container=docker ENV container docker
CMD ["/sbin/init"] CMD ["/sbin/init"]

13
test/utils/docker/ubuntu1404/init-fake.conf Normal file
View file

@ -0,0 +1,13 @@
# fake some events needed for correct startup other services
description "In-Container Upstart Fake Events"
start on startup
script
rm -rf /var/run/*.pid
rm -rf /var/run/network/*
/sbin/initctl emit stopped JOB=udevtrigger --no-wait
/sbin/initctl emit started JOB=udev --no-wait
/sbin/initctl emit runlevel RUNLEVEL=3 --no-wait
end script