diff options
| author | Martin André <martin.andre@kvhasia.com> | 2015-02-26 15:00:42 +0900 |
|---|---|---|
| committer | Martin André <martin.andre@kvhasia.com> | 2015-03-02 14:08:06 +0900 |
| commit | 0764fd7dea3f56627bb42e285cfb818cce08229e (patch) | |
| tree | b31933605cef228bca79737cbefc94b79c5e2e8f /docker/swift | |
| parent | 5052e54f45998110ec10239bb715ff80d51042ab (diff) | |
| download | kolla-0764fd7dea3f56627bb42e285cfb818cce08229e.tar.gz kolla-0764fd7dea3f56627bb42e285cfb818cce08229e.zip | |
Allow changing base image
By changing the PREFIX variable in the .buildconf one is now able to
build docker images from different bases.
For example, add the following line to your .buildconf file to build
CentOS based images:
PREFIX=centos-rdo-
Default base image is Fedora. For now only RH family is supported.
Additionally, changing the namespace either with the NAMESPACE variable
in .buildconf or via --namespace commandline option now changes the
source namespace as well from the default kollaglue one.
Implements: blueprint multi-baseos
Co-Authored-By: Steven Dake <stdake@cisco.com>
Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-account/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/swift/swift-container/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/swift/swift-object/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/swift/swift-account/Dockerfile b/docker/swift/swift-account/Dockerfile index eefaecdb7..c3fe8d87a 100644 --- a/docker/swift/swift-account/Dockerfile +++ b/docker/swift/swift-account/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-swift-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh diff --git a/docker/swift/swift-base/Dockerfile b/docker/swift/swift-base/Dockerfile index 80be78e9c..965d65226 100644 --- a/docker/swift/swift-base/Dockerfile +++ b/docker/swift/swift-base/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-utils openstack-swift && yum clean all diff --git a/docker/swift/swift-container/Dockerfile b/docker/swift/swift-container/Dockerfile index eefaecdb7..c3fe8d87a 100644 --- a/docker/swift/swift-container/Dockerfile +++ b/docker/swift/swift-container/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-swift-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh diff --git a/docker/swift/swift-object/Dockerfile b/docker/swift/swift-object/Dockerfile index eefaecdb7..c3fe8d87a 100644 --- a/docker/swift/swift-object/Dockerfile +++ b/docker/swift/swift-object/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-swift-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh diff --git a/docker/swift/swift-proxy-server/Dockerfile b/docker/swift/swift-proxy-server/Dockerfile index eefaecdb7..c3fe8d87a 100644 --- a/docker/swift/swift-proxy-server/Dockerfile +++ b/docker/swift/swift-proxy-server/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-swift-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh |