diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-06 00:44:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-06 00:44:02 +0000 |
| commit | c3114b961086be034c6674a916361e2033c87986 (patch) | |
| tree | 0a957c08d9d7c1505b53231d2cd52aef09bf4dc9 /docker/swift | |
| parent | eaf15893a0af7fef1825601bedbd2704a291dd33 (diff) | |
| parent | 0764fd7dea3f56627bb42e285cfb818cce08229e (diff) | |
| download | kolla-c3114b961086be034c6674a916361e2033c87986.tar.gz kolla-c3114b961086be034c6674a916361e2033c87986.zip | |
Merge "Allow changing base image"
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 |