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/nova-controller | |
| parent | eaf15893a0af7fef1825601bedbd2704a291dd33 (diff) | |
| parent | 0764fd7dea3f56627bb42e285cfb818cce08229e (diff) | |
| download | kolla-c3114b961086be034c6674a916361e2033c87986.tar.gz kolla-c3114b961086be034c6674a916361e2033c87986.zip | |
Merge "Allow changing base image"
Diffstat (limited to 'docker/nova-controller')
| -rw-r--r-- | docker/nova-controller/nova-api/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/nova-controller/nova-conductor/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/nova-controller/nova-scheduler/Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile index b20bd4547..2ac871dad 100644 --- a/docker/nova-controller/nova-api/Dockerfile +++ b/docker/nova-controller/nova-api/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile index 4d7502d41..d2bb00a82 100644 --- a/docker/nova-controller/nova-conductor/Dockerfile +++ b/docker/nova-controller/nova-conductor/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/nova-controller/nova-scheduler/Dockerfile index 14b49ba0a..5190b10f6 100644 --- a/docker/nova-controller/nova-scheduler/Dockerfile +++ b/docker/nova-controller/nova-scheduler/Dockerfile @@ -1,4 +1,4 @@ -FROM kollaglue/fedora-rdo-nova-base +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install \ |