summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-02-02 17:31:53 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-02-02 17:31:53 +0100
commitb9477d3a49ab5ca57760141e10c43f9e9605691f (patch)
treeb819c01be40dce02931602c6564aa2a6628bd3c3
parent5ea9ae2cbfe5462e295d38ee13ccc531542a80bc (diff)
downloaddocker-b9477d3a49ab5ca57760141e10c43f9e9605691f.tar.gz
Replace Development with Winterfell
-rw-r--r--00-base/Dockerfile12
-rw-r--r--99-ci-maipo/Dockerfile6
-rw-r--r--99-ci-twentythree/Dockerfile6
-rw-r--r--99-ci-twentytwo/Dockerfile6
-rw-r--r--docs/index.rst2
5 files changed, 16 insertions, 16 deletions
diff --git a/00-base/Dockerfile b/00-base/Dockerfile
index 01eb2a2..5f5e7d0 100644
--- a/00-base/Dockerfile
+++ b/00-base/Dockerfile
@@ -23,14 +23,14 @@ RUN yum -y install epel-release && \
# Add the EPEL key.
RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-# Add the Kolab:Development repository.
-ADD http://obs.kolabsys.com/repositories/Kolab:/Development/CentOS_7/Kolab:Development.repo \
- /etc/yum.repos.d/Kolab:Development.repo
+# Add the Kolab:Winterfell repository.
+ADD http://obs.kolabsys.com/repositories/Kolab:/Winterfell/CentOS_7/Kolab:Winterfell.repo \
+ /etc/yum.repos.d/Kolab:Winterfell.repo
-# Give the Kolab:Development repository priority over everything else.
-RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Development.repo
+# Give the Kolab:Winterfell repository priority over everything else.
+RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Winterfell.repo
-# Add the Kolab:Development key.
+# Add the Kolab:Winterfell key.
RUN rpm --import https://ssl.kolabsys.com/community.asc
# Make YUM obey priorities configured.
diff --git a/99-ci-maipo/Dockerfile b/99-ci-maipo/Dockerfile
index e455a57..05c2363 100644
--- a/99-ci-maipo/Dockerfile
+++ b/99-ci-maipo/Dockerfile
@@ -1,8 +1,8 @@
FROM centos:centos7
MAINTAINER Kolab Systems <vanmeeuwen@kolabsys.com>
-ADD http://obs.kolabsys.com/repositories/Kolab:/Development/CentOS_7/Kolab:Development.repo \
- /etc/yum.repos.d/Kolab:Development.repo
+ADD http://obs.kolabsys.com/repositories/Kolab:/Winterfell/CentOS_7/Kolab:Winterfell.repo \
+ /etc/yum.repos.d/Kolab:Winterfell.repo
ADD http://obs.kolabsys.com/repositories/Kolab:/3.4/CentOS_7/Kolab:3.4.repo \
/etc/yum.repos.d/Kolab:3.4.repo
@@ -10,7 +10,7 @@ ADD http://obs.kolabsys.com/repositories/Kolab:/3.4/CentOS_7/Kolab:3.4.repo \
ADD http://obs.kolabsys.com/repositories/Kolab:/3.4:/Updates/CentOS_7/Kolab:3.4:Updates.repo \
/etc/yum.repos.d/Kolab:3.4:Updates.repo
-RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Development.repo
+RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Winterfell.repo
RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:3.4.repo
diff --git a/99-ci-twentythree/Dockerfile b/99-ci-twentythree/Dockerfile
index 430aca8..d7a58ac 100644
--- a/99-ci-twentythree/Dockerfile
+++ b/99-ci-twentythree/Dockerfile
@@ -1,10 +1,10 @@
FROM fedora:23
MAINTAINER Kolab Systems <vanmeeuwen@kolabsys.com>
-ADD http://obs.kolabsys.com/repositories/Kolab:/Development/Fedora_23/Kolab:Development.repo \
- /etc/yum.repos.d/Kolab:Development.repo
+ADD http://obs.kolabsys.com/repositories/Kolab:/Winterfell/Fedora_23/Kolab:Winterfell.repo \
+ /etc/yum.repos.d/Kolab:Winterfell.repo
-RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Development.repo
+RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Winterfell.repo
RUN rpm --import https://ssl.kolabsys.com/community.asc
diff --git a/99-ci-twentytwo/Dockerfile b/99-ci-twentytwo/Dockerfile
index a1bc0b3..1945272 100644
--- a/99-ci-twentytwo/Dockerfile
+++ b/99-ci-twentytwo/Dockerfile
@@ -1,10 +1,10 @@
FROM fedora:22
MAINTAINER Kolab Systems <vanmeeuwen@kolabsys.com>
-ADD http://obs.kolabsys.com/repositories/Kolab:/Development/Fedora_22/Kolab:Development.repo \
- /etc/yum.repos.d/Kolab:Development.repo
+ADD http://obs.kolabsys.com/repositories/Kolab:/Winterfell/Fedora_22/Kolab:Winterfell.repo \
+ /etc/yum.repos.d/Kolab:Winterfell.repo
-RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Development.repo
+RUN echo "priority=60" >> /etc/yum.repos.d/Kolab:Winterfell.repo
RUN rpm --import https://ssl.kolabsys.com/community.asc
diff --git a/docs/index.rst b/docs/index.rst
index 1254db3..db5a575 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -440,7 +440,7 @@ Container Images
Based on ``centos:centos7``.
-Installs the ``Kolab:Development/CentOS_7`` software repository, the
+Installs the ``Kolab:Winterfell/CentOS_7`` software repository, the
**yum-plugin-priorities** package, and installs the GPG key.
Adds common functionality used in other images' entry points in a file