diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-06 16:09:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-06 16:09:30 +0000 |
| commit | a5bd2f2d5d0caff7348f5eba6cd6223f858c344b (patch) | |
| tree | ff621625a4df0e5a5548a34afbc434f00c100861 /docker | |
| parent | 3c51b6f7c9b05f24022581b3896309385cb54d2f (diff) | |
| parent | 298ce72106ca1f3e94ff8e0db48685c739bcf81c (diff) | |
| download | kolla-a5bd2f2d5d0caff7348f5eba6cd6223f858c344b.tar.gz kolla-a5bd2f2d5d0caff7348f5eba6cd6223f858c344b.zip | |
Merge "Base all images on kollaglue ones"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/Dockerfile | 2 | ||||
| -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 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/cinder/Dockerfile b/docker/cinder/Dockerfile index 9a3a08eed..1df804cd9 100644 --- a/docker/cinder/Dockerfile +++ b/docker/cinder/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora-rdo-base +FROM kollaglue/fedora-rdo-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-cinder && yum clean all diff --git a/docker/swift/swift-account/Dockerfile b/docker/swift/swift-account/Dockerfile index a73ecb817..0ecc51740 100644 --- a/docker/swift/swift-account/Dockerfile +++ b/docker/swift/swift-account/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora-rdo-base +FROM kollaglue/fedora-rdo-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 281a91719..80be78e9c 100644 --- a/docker/swift/swift-base/Dockerfile +++ b/docker/swift/swift-base/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora-rdo-base +FROM kollaglue/fedora-rdo-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 a73ecb817..0ecc51740 100644 --- a/docker/swift/swift-container/Dockerfile +++ b/docker/swift/swift-container/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora-rdo-base +FROM kollaglue/fedora-rdo-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 a73ecb817..0ecc51740 100644 --- a/docker/swift/swift-object/Dockerfile +++ b/docker/swift/swift-object/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora-rdo-base +FROM kollaglue/fedora-rdo-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 065f315cd..eefaecdb7 100644 --- a/docker/swift/swift-proxy-server/Dockerfile +++ b/docker/swift/swift-proxy-server/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora-rdo-swift-base +FROM kollaglue/fedora-rdo-swift-base MAINTAINER Kolla Project (https://launchpad.net/kolla) ADD ./start.sh /start.sh |