summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-03-07 06:08:43 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-03-07 06:08:43 +0100
commit0217e02a9bde68ac90793547ac7bfa5a09f54825 (patch)
tree54b138b1af9be78114b4d9efd658d27246851ecc
parent13f68e698ef21ce9f2991700d27544344380354a (diff)
downloaddocker-0217e02a9bde68ac90793547ac7bfa5a09f54825.tar.gz
Disable fastestmirror earlier
-rw-r--r--99-ci-maipo/Dockerfile15
1 files changed, 8 insertions, 7 deletions
diff --git a/99-ci-maipo/Dockerfile b/99-ci-maipo/Dockerfile
index 8ead9ab..d6ea504 100644
--- a/99-ci-maipo/Dockerfile
+++ b/99-ci-maipo/Dockerfile
@@ -6,7 +6,14 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
RUN sed -r -i \
-e 's/^mirrorlist/#mirrorlist/g' \
-e 's/^#baseurl/baseurl/g' \
- /etc/yum.repos.d/*.repo
+ /etc/yum.repos.d/*.repo && \
+ sed -i \
+ -e '/tsflags=nodocs/d' \
+ -e '/override_install_langs/d' \
+ /etc/yum.conf && \
+ sed -r -i \
+ -e 's/enabled\s*=\s*1/enabled=0/g' \
+ /etc/yum/pluginconf.d/fastestmirror.conf
RUN yum -y install wget && \
yum clean all
@@ -38,12 +45,6 @@ RUN wget -O/etc/yum.repos.d/openSUSE:Tools.repo \
RUN rpm --import http://download.opensuse.org/repositories/openSUSE:/Tools/CentOS_7/repodata/repomd.xml.key
-RUN sed -i \
- -e '/tsflags=nodocs/d' \
- -e '/override_install_langs/d' \
- /etc/yum.conf && \
- sed -r -i -e 's/enabled\s*=\s*1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
-
ENV IMAGE maipo
ADD /dbus.service /etc/systemd/system/dbus.service