openstack/kolla-ansible
Code Issues Proposed changes

Port to icehouse

Browse Source 
This represents making build-docker-images --release build
with the icehouse tag and causes docker-compsoe to pull from
the icehouse tag.

Partially-implements: blueprint port-kilo

Change-Id: I66b2c39abc55c0f47152dd90e696fc46b9c58f50
This commit is contained in:
Steven Dake 2015-05-04 17:26:30 -07:00
parent d8a7af93eb
commit d30f69bc83
53 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/glance-api-registry.yml
View File

@ -1,12 +1,12 @@
glanceregistry:
image: kollaglue/centos-rdo-glance-registry
image: kollaglue/centos-rdo-glance-registry:icehouse
name: glance-registry
net: "host"
restart: always
env_file:
- openstack.env
glanceapi:
image: kollaglue/centos-rdo-glance-api
image: kollaglue/centos-rdo-glance-api:icehouse
name: glance-api
net: "host"
restart: always

2
compose/heat-api-cfn.yml
View File

@ -1,5 +1,5 @@
heatapicfn:
image: kollaglue/centos-rdo-heat-api-cfn
image: kollaglue/centos-rdo-heat-api-cfn:icehouse
name: heat-api-cfn
net: "host"
restart: always

6
compose/heat-api-engine.yml
View File

@ -1,14 +1,14 @@
heatapi:
image: kollaglue/centos-rdo-heat-api
image: kollaglue/centos-rdo-heat-api:icehouse
name: heat-api
net: "host"
restart: always
env_file:
- openstack.env
heatengine:
image: kollaglue/centos-rdo-heat-engine
image: kollaglue/centos-rdo-heat-engine:icehouse
name: heat-engine
net: "host"
restart: always
env_file:
- openstack.env
- openstack.env

2
compose/horizon.yml
View File

@ -1,5 +1,5 @@
horizon:
image: kollaglue/centos-rdo-horizon
image: kollaglue/centos-rdo-horizon:icehouse
name: horizon
net: "host"
restart: always

2
compose/keystone.yml
View File

@ -1,5 +1,5 @@
keystone:
image: kollaglue/centos-rdo-keystone
image: kollaglue/centos-rdo-keystone:icehouse
name: keystone
restart: always
net: "host"

4
compose/mariadb.yml
View File

@ -1,10 +1,10 @@
mariadbdata:
image: kollaglue/centos-rdo-mariadb-data
image: kollaglue/centos-rdo-mariadb-data:icehouse
name: mariadbdata
restart: on-failure
mariadbapp:
image: kollaglue/centos-rdo-mariadb-app
image: kollaglue/centos-rdo-mariadb-app:icehouse
name: mariadbapp
restart: always
env_file:

2
compose/neutron-agents.yml
View File

@ -1,5 +1,5 @@
neutronagents:
image: kollaglue/centos-rdo-neutron-agents:latest
image: kollaglue/centos-rdo-neutron-agents:icehouse
name: neutron-agents
net: "host"
privileged: true

2
compose/neutron-server.yml
View File

@ -1,5 +1,5 @@
neutronserver:
image: kollaglue/centos-rdo-neutron-server:latest
image: kollaglue/centos-rdo-neutron-server:icehouse
name: neutron-server
net: "host"
restart: always

10
compose/nova-api-compute-network.yml
View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data
image: kollaglue/centos-rdo-nova-compute-data:icehouse
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt
image: kollaglue/centos-rdo-nova-libvirt:icehouse
name: libvirt
net: host
pid: host
@ -19,7 +19,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network
image: kollaglue/centos-rdo-nova-network:icehouse
name: nova-network
net: host
privileged: true
@ -38,7 +38,7 @@ novanetwork:
# nova-metadata api is required in multi_host nova network mode.
# http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
novaapi:
image: kollaglue/centos-rdo-nova-api:latest
image: kollaglue/centos-rdo-nova-api:icehouse
name: nova-api
privileged: True
net: "host"
@ -49,7 +49,7 @@ novaapi:
- /lib/modules:/lib/modules:ro
novacompute:
image: kollaglue/centos-rdo-nova-compute
image: kollaglue/centos-rdo-nova-compute:icehouse
name: nova-compute
net: host
privileged: true

6
compose/nova-api-conductor-scheduler.yml
View File

@ -1,5 +1,5 @@
novaconductor:
image: kollaglue/centos-rdo-nova-conductor:latest
image: kollaglue/centos-rdo-nova-conductor:icehouse
name: nova-conductor
net: "host"
restart: always
@ -9,7 +9,7 @@ novaconductor:
# Unfortunately nova api needs to be privileged as it wants to run
# a firewall command.
novaapi:
image: kollaglue/centos-rdo-nova-api:latest
image: kollaglue/centos-rdo-nova-api:icehouse
name: nova-api
privileged: True
net: "host"
@ -18,7 +18,7 @@ novaapi:
- openstack.env
novascheduler:
image: kollaglue/centos-rdo-nova-scheduler:latest
image: kollaglue/centos-rdo-nova-scheduler:icehouse
name: nova-scheduler
net: "host"
restart: always

8
compose/nova-compute-network.yml
View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data
image: kollaglue/centos-rdo-nova-compute-data:icehouse
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt
image: kollaglue/centos-rdo-nova-libvirt:icehouse
name: libvirt
net: host
pid: host
@ -18,7 +18,7 @@ libvirt:
- computedata
novanetwork:
image: kollaglue/centos-rdo-nova-network
image: kollaglue/centos-rdo-nova-network:icehouse
name: nova-network
net: host
privileged: true
@ -33,7 +33,7 @@ novanetwork:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute
image: kollaglue/centos-rdo-nova-compute:icehouse
name: nova-compute
net: host
privileged: true

6
compose/nova-compute.yml
View File

@ -1,9 +1,9 @@
computedata:
image: kollaglue/centos-rdo-nova-compute-data
image: kollaglue/centos-rdo-nova-compute-data:icehouse
name: computedata
libvirt:
image: kollaglue/centos-rdo-nova-libvirt
image: kollaglue/centos-rdo-nova-libvirt:icehouse
name: libvirt
net: host
pid: host
@ -19,7 +19,7 @@ libvirt:
- computedata
novacompute:
image: kollaglue/centos-rdo-nova-compute
image: kollaglue/centos-rdo-nova-compute:icehouse
name: nova-compute
net: host
privileged: true

2
compose/rabbitmq.yml
View File

@ -1,5 +1,5 @@
rabbitmq:
image: kollaglue/centos-rdo-rabbitmq
image: kollaglue/centos-rdo-rabbitmq:icehouse
name: rabbitmq
restart: always
net: "host"

2
docker/barbican/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh

2
docker/ceilometer/ceilometer-alarm/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all

2
docker/ceilometer/ceilometer-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all

2
docker/ceilometer/ceilometer-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla

2
docker/ceilometer/ceilometer-central/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all

2
docker/ceilometer/ceilometer-collector/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all

2
docker/ceilometer/ceilometer-compute/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \

2
docker/ceilometer/ceilometer-notification/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-notification && yum clean all

6
docker/centos-rdo-base/Dockerfile
View File

@ -2,14 +2,10 @@ FROM centos
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
RUN yum -y install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm && yum clean all
RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo
RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo
# CentOS 7.1 workaround
RUN sed "s/Derived from Red Hat Enterprise Linux 7.1 (Source)/7/" "/etc/yum.repos.d/rdo-release.repo" -i
# CentOS 7.1 workaround for conflicting packages with libvirt
RUN rpm -e --nodeps systemd-container systemd-container-libs
RUN yum -y install systemd systemd-libs systemd-devel && yum clean all

2
docker/cinder/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder && yum clean all

2
docker/fedora-rdo-base/Dockerfile
View File

@ -2,7 +2,7 @@ FROM fedora:20
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
RUN yum -y install https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm
RUN yum -y install dnf dnf-plugins-core && yum clean all
RUN dnf copr enable -y larsks/crux
run dnf copr enable -y sdake/pam.noaudit

2
docker/glance/glance-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME /var/lib/glance

2
docker/glance/glance-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-glance && yum clean all

2
docker/glance/glance-registry/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh

2
docker/heat/heat-api-cfn/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \

2
docker/heat/heat-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO: configure cfn and cloudwatch

2
docker/heat/heat-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla

2
docker/heat/heat-engine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \

2
docker/horizon/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-dashboard \

2
docker/keystone/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages

2
docker/mariadb-app/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install packages

2
docker/mariadb-data/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/mysql" ]

2
docker/mongodb/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install mongodb mongodb-server && yum clean all

2
docker/neutron/neutron-agents/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install supervisor

2
docker/neutron/neutron-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-neutron-ml2 && yum clean all

2
docker/neutron/neutron-server/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages

2
docker/nova-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-common \

2
docker/nova-compute/nova-compute-data/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME [ "/var/lib/nova" ]

2
docker/nova-compute/nova-compute/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute \

2
docker/nova-compute/nova-libvirt/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install libvirt-daemon \

2
docker/nova-compute/nova-network/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-network \

2
docker/nova-controller/nova-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \

2
docker/nova-controller/nova-conductor/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \

2
docker/nova-controller/nova-scheduler/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \

2
docker/rabbitmq/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages

2
docker/swift/swift-account/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh

2
docker/swift/swift-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-utils openstack-swift && yum clean all

2
docker/swift/swift-container/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh

2
docker/swift/swift-object/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh

2
docker/swift/swift-proxy-server/Dockerfile
View File

@ -1,4 +1,4 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh