Updating docker files for tests

This commit is contained in:
James Cammarata 2016-03-03 21:03:28 -05:00
parent e4acd44e23
commit f56af2ec3f
2 changed files with 0 additions and 15 deletions

View file

@ -1,10 +1,6 @@
# Latest version of centos
FROM centos:centos7
ENV LC_ALL en_US.UTF-8
#RUN yum -y swap fakesystemd systemd
RUN yum -y update; yum clean all; yum -y swap fakesystemd systemd
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*; \
rm -f /etc/systemd/system/*.wants/*; \
@ -13,7 +9,6 @@ rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /lib/systemd/system/basic.target.wants/*; \
rm -f /lib/systemd/system/anaconda.target.wants/*;
RUN yum -y install \
dbus-python \
epel-release \
@ -25,7 +20,6 @@ RUN yum -y install \
sudo \
unzip \
which
RUN yum -y install \
PyYAML \
python-coverage \
@ -38,11 +32,9 @@ RUN yum -y install \
python-pip \
python-setuptools \
python-virtualenv
RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
RUN mkdir /etc/ansible/
RUN echo -e '[local]\nlocalhost' > /etc/ansible/hosts
VOLUME /sys/fs/cgroup /run /tmp
ENV container=docker
CMD ["/usr/sbin/init"]

View file

@ -1,8 +1,5 @@
FROM ubuntu:trusty
ENV LC_ALL en_US.UTF-8
RUN apt-get clean; apt-get update -y;
RUN apt-get install -y \
debianutils \
git \
@ -12,7 +9,6 @@ RUN apt-get install -y \
subversion \
sudo \
unzip
RUN apt-get install -y \
python-coverage \
python-httplib2 \
@ -25,11 +21,8 @@ RUN apt-get install -y \
python-setuptools \
python-virtualenv \
python-yaml
RUN sed -i -e 's/^\(Defaults\s*requiretty\)/#--- \1/' /etc/sudoers
RUN mkdir /etc/ansible/
RUN echo -e '[local]\nlocalhost' > /etc/ansible/hosts
VOLUME /sys/fs/cgroup /run /tmp
ENV container=docker
CMD ["/sbin/init"]