summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-02-19 18:47:02 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-02-19 18:47:02 +0100
commitb6750bc42e05c7aa86b8e48464b3fb2c4fdac8fa (patch)
tree0352e7e642469591b7e6b25db0b63fa527ba6dc1
parentaa885beefa4594e9f16820b469c1a7d6fab69ebe (diff)
downloaddocker-b6750bc42e05c7aa86b8e48464b3fb2c4fdac8fa.tar.gz
Re-order some commands
-rw-r--r--99-ci-maipo/Dockerfile35
1 files changed, 22 insertions, 13 deletions
diff --git a/99-ci-maipo/Dockerfile b/99-ci-maipo/Dockerfile
index 2dc29f2..05d651f 100644
--- a/99-ci-maipo/Dockerfile
+++ b/99-ci-maipo/Dockerfile
@@ -3,11 +3,14 @@ MAINTAINER Kolab Systems <vanmeeuwen@kolabsys.com>
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-ADD http://obs.kolabsys.com/repositories/Kolab:/Winterfell/CentOS_7/Kolab:Winterfell.repo \
- /etc/yum.repos.d/Kolab:Winterfell.repo
+RUN yum -y install wget && \
+ yum clean all
+
+RUN wget -O/etc/yum.repos.d/Kolab:Winterfell.repo \
+ http://obs.kolabsys.com/repositories/Kolab:/Winterfell/CentOS_7/Kolab:Winterfell.repo
-ADD http://obs.kolabsys.com/repositories/Kolab:/16/CentOS_7/Kolab:16.repo \
- /etc/yum.repos.d/Kolab:16.repo
+RUN wget -O/etc/yum.repos.d/Kolab:16.repo \
+ http://obs.kolabsys.com/repositories/Kolab:/16/CentOS_7/Kolab:16.repo
RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Winterfell.repo
@@ -15,8 +18,8 @@ RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:16.repo
RUN rpm --import https://ssl.kolabsys.com/community.asc
-ADD http://download.opensuse.org/repositories/openSUSE:Tools/CentOS_7/openSUSE:Tools.repo \
- /etc/yum.repos.d/openSUSE:Tools.repo
+RUN wget -O/etc/yum.repos.d/openSUSE:Tools.repo \
+ http://download.opensuse.org/repositories/openSUSE:Tools/CentOS_7/openSUSE:Tools.repo
RUN rpm --import http://download.opensuse.org/repositories/openSUSE:/Tools/CentOS_7/repodata/repomd.xml.key
@@ -33,13 +36,6 @@ RUN ln -sf dbus.service /etc/systemd/system/messagebus.service
ADD /httpd.service /etc/systemd/system/httpd.service
-ADD /systemctl /usr/bin/systemctl
-ADD /systemctl-socket-daemon /usr/bin/systemctl-socket-daemon
-
-RUN chmod -v a+rx \
- /usr/bin/systemctl \
- /usr/bin/systemctl-socket-daemon
-
ADD /vimrc /root/.vimrc
RUN sed -r -i \
@@ -55,6 +51,7 @@ RUN yum clean all && \
-e '/^mirrorlist/d' \
/etc/yum.repos.d/epel*.repo && \
yum -y install yum-plugin-priorities && \
+ yum -y update && \
yum -y install \
@buildsys-build \
ant \
@@ -70,6 +67,8 @@ RUN yum clean all && \
perl-Digest-MD5 \
perl-TimeDate \
php-phpunit-PHPUnit-Selenium \
+ policycoreutils \
+ policycoreutils-python \
psmisc \
rpmdevtools \
screen \
@@ -82,6 +81,16 @@ RUN yum clean all && \
yum-utils && \
yum clean all
+ADD /systemctl /usr/bin/systemctl
+ADD /systemctl-socket-daemon /usr/bin/systemctl-socket-daemon
+
+RUN chmod -v a+rx \
+ /usr/bin/systemctl \
+ /usr/bin/systemctl-socket-daemon
+
+RUN mkdir -p /run/lock
+RUN ln -sf /bin/true /sbin/semanage
+
RUN sed -i -e '/requiretty/d' /etc/sudoers
WORKDIR /srv