diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-04 17:26:30 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 09:58:43 -0700 |
| commit | d30f69bc8327bf37e013c9647c99d9192eec8830 (patch) | |
| tree | b3f831de844ea86a011a14fca23f97ec72b63db9 /docker | |
| parent | d8a7af93eb7b05c74082526b23cb4347851d95cf (diff) | |
| download | kolla-d30f69bc8327bf37e013c9647c99d9192eec8830.tar.gz kolla-d30f69bc8327bf37e013c9647c99d9192eec8830.zip | |
Port to icehouse
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
Diffstat (limited to 'docker')
40 files changed, 40 insertions, 44 deletions
diff --git a/docker/barbican/Dockerfile b/docker/barbican/Dockerfile index fecb78413..c52cb828b 100644 --- a/docker/barbican/Dockerfile +++ b/docker/barbican/Dockerfile @@ -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 diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile b/docker/ceilometer/ceilometer-alarm/Dockerfile index fc8d7742e..fe6c44fc2 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile @@ -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 diff --git a/docker/ceilometer/ceilometer-api/Dockerfile b/docker/ceilometer/ceilometer-api/Dockerfile index aaaf7c8df..7a1337c7b 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile +++ b/docker/ceilometer/ceilometer-api/Dockerfile @@ -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 diff --git a/docker/ceilometer/ceilometer-base/Dockerfile b/docker/ceilometer/ceilometer-base/Dockerfile index ba2506e3a..6aaf77ab2 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile +++ b/docker/ceilometer/ceilometer-base/Dockerfile @@ -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 diff --git a/docker/ceilometer/ceilometer-central/Dockerfile b/docker/ceilometer/ceilometer-central/Dockerfile index 18ed633d6..bd5137306 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile +++ b/docker/ceilometer/ceilometer-central/Dockerfile @@ -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 diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile b/docker/ceilometer/ceilometer-collector/Dockerfile index b654b2622..6c54dce4a 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile +++ b/docker/ceilometer/ceilometer-collector/Dockerfile @@ -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 diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile b/docker/ceilometer/ceilometer-compute/Dockerfile index 4b03c4f00..9f2a701d8 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile +++ b/docker/ceilometer/ceilometer-compute/Dockerfile @@ -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 \ diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile b/docker/ceilometer/ceilometer-notification/Dockerfile index 1f8795645..72d291bcb 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile +++ b/docker/ceilometer/ceilometer-notification/Dockerfile @@ -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 diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 2b6c1d7f3..963aadcf9 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -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 diff --git a/docker/cinder/Dockerfile b/docker/cinder/Dockerfile index 52f211991..3dd7eca59 100644 --- a/docker/cinder/Dockerfile +++ b/docker/cinder/Dockerfile @@ -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 diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile index f41cac97e..96f2e4951 100644 --- a/docker/fedora-rdo-base/Dockerfile +++ b/docker/fedora-rdo-base/Dockerfile @@ -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 diff --git a/docker/glance/glance-api/Dockerfile b/docker/glance/glance-api/Dockerfile index 0ce10935c..a4bd45bd1 100644 --- a/docker/glance/glance-api/Dockerfile +++ b/docker/glance/glance-api/Dockerfile @@ -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 diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile index 74b5c0e23..67b788fcc 100644 --- a/docker/glance/glance-base/Dockerfile +++ b/docker/glance/glance-base/Dockerfile @@ -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 diff --git a/docker/glance/glance-registry/Dockerfile b/docker/glance/glance-registry/Dockerfile index e9937dc7f..f950ce685 100644 --- a/docker/glance/glance-registry/Dockerfile +++ b/docker/glance/glance-registry/Dockerfile @@ -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 diff --git a/docker/heat/heat-api-cfn/Dockerfile b/docker/heat/heat-api-cfn/Dockerfile index 2fa2ad5de..18a7e369d 100644 --- a/docker/heat/heat-api-cfn/Dockerfile +++ b/docker/heat/heat-api-cfn/Dockerfile @@ -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 \ diff --git a/docker/heat/heat-api/Dockerfile b/docker/heat/heat-api/Dockerfile index 76149b280..407aee601 100644 --- a/docker/heat/heat-api/Dockerfile +++ b/docker/heat/heat-api/Dockerfile @@ -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 diff --git a/docker/heat/heat-base/Dockerfile b/docker/heat/heat-base/Dockerfile index 4e5646b55..ebe9fa15c 100644 --- a/docker/heat/heat-base/Dockerfile +++ b/docker/heat/heat-base/Dockerfile @@ -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 diff --git a/docker/heat/heat-engine/Dockerfile b/docker/heat/heat-engine/Dockerfile index 544830d06..227ac335d 100644 --- a/docker/heat/heat-engine/Dockerfile +++ b/docker/heat/heat-engine/Dockerfile @@ -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 \ diff --git a/docker/horizon/Dockerfile b/docker/horizon/Dockerfile index f153ef996..ce925baf2 100644 --- a/docker/horizon/Dockerfile +++ b/docker/horizon/Dockerfile @@ -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 \ diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile index 35e731592..377ef7b4f 100644 --- a/docker/keystone/Dockerfile +++ b/docker/keystone/Dockerfile @@ -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 diff --git a/docker/mariadb-app/Dockerfile b/docker/mariadb-app/Dockerfile index 692fd2bb0..dc4025454 100644 --- a/docker/mariadb-app/Dockerfile +++ b/docker/mariadb-app/Dockerfile @@ -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 diff --git a/docker/mariadb-data/Dockerfile b/docker/mariadb-data/Dockerfile index 627884a68..f60599d16 100644 --- a/docker/mariadb-data/Dockerfile +++ b/docker/mariadb-data/Dockerfile @@ -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" ] diff --git a/docker/mongodb/Dockerfile b/docker/mongodb/Dockerfile index 81278092f..e05047f02 100644 --- a/docker/mongodb/Dockerfile +++ b/docker/mongodb/Dockerfile @@ -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 diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/neutron/neutron-agents/Dockerfile index e083aa9b8..5d50bbfc1 100644 --- a/docker/neutron/neutron-agents/Dockerfile +++ b/docker/neutron/neutron-agents/Dockerfile @@ -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 diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile index 22922a04c..c8a5ef2d9 100644 --- a/docker/neutron/neutron-base/Dockerfile +++ b/docker/neutron/neutron-base/Dockerfile @@ -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 diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/neutron/neutron-server/Dockerfile index edd6ea559..8d59dd04a 100644 --- a/docker/neutron/neutron-server/Dockerfile +++ b/docker/neutron/neutron-server/Dockerfile @@ -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 diff --git a/docker/nova-base/Dockerfile b/docker/nova-base/Dockerfile index efd260cda..d116ac973 100644 --- a/docker/nova-base/Dockerfile +++ b/docker/nova-base/Dockerfile @@ -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 \ diff --git a/docker/nova-compute/nova-compute-data/Dockerfile b/docker/nova-compute/nova-compute-data/Dockerfile index 07e26709d..0af407095 100644 --- a/docker/nova-compute/nova-compute-data/Dockerfile +++ b/docker/nova-compute/nova-compute-data/Dockerfile @@ -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" ] diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile index 079687c3a..d23b86e5f 100644 --- a/docker/nova-compute/nova-compute/Dockerfile +++ b/docker/nova-compute/nova-compute/Dockerfile @@ -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 \ diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile index 8f7305a95..980940615 100644 --- a/docker/nova-compute/nova-libvirt/Dockerfile +++ b/docker/nova-compute/nova-libvirt/Dockerfile @@ -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 \ diff --git a/docker/nova-compute/nova-network/Dockerfile b/docker/nova-compute/nova-network/Dockerfile index 11eb7effa..2434dbdf0 100644 --- a/docker/nova-compute/nova-network/Dockerfile +++ b/docker/nova-compute/nova-network/Dockerfile @@ -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 \ diff --git a/docker/nova-controller/nova-api/Dockerfile b/docker/nova-controller/nova-api/Dockerfile index 12a2add20..7abd32087 100644 --- a/docker/nova-controller/nova-api/Dockerfile +++ b/docker/nova-controller/nova-api/Dockerfile @@ -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 \ diff --git a/docker/nova-controller/nova-conductor/Dockerfile b/docker/nova-controller/nova-conductor/Dockerfile index d2bb00a82..f91113bad 100644 --- a/docker/nova-controller/nova-conductor/Dockerfile +++ b/docker/nova-controller/nova-conductor/Dockerfile @@ -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 \ diff --git a/docker/nova-controller/nova-scheduler/Dockerfile b/docker/nova-controller/nova-scheduler/Dockerfile index 5190b10f6..2eec47554 100644 --- a/docker/nova-controller/nova-scheduler/Dockerfile +++ b/docker/nova-controller/nova-scheduler/Dockerfile @@ -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 \ diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index e269e1f42..9212d15eb 100644 --- a/docker/rabbitmq/Dockerfile +++ b/docker/rabbitmq/Dockerfile @@ -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 diff --git a/docker/swift/swift-account/Dockerfile b/docker/swift/swift-account/Dockerfile index c3fe8d87a..2c26802e3 100644 --- a/docker/swift/swift-account/Dockerfile +++ b/docker/swift/swift-account/Dockerfile @@ -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 diff --git a/docker/swift/swift-base/Dockerfile b/docker/swift/swift-base/Dockerfile index 965d65226..59600a23d 100644 --- a/docker/swift/swift-base/Dockerfile +++ b/docker/swift/swift-base/Dockerfile @@ -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 diff --git a/docker/swift/swift-container/Dockerfile b/docker/swift/swift-container/Dockerfile index c3fe8d87a..2c26802e3 100644 --- a/docker/swift/swift-container/Dockerfile +++ b/docker/swift/swift-container/Dockerfile @@ -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 diff --git a/docker/swift/swift-object/Dockerfile b/docker/swift/swift-object/Dockerfile index c3fe8d87a..2c26802e3 100644 --- a/docker/swift/swift-object/Dockerfile +++ b/docker/swift/swift-object/Dockerfile @@ -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 diff --git a/docker/swift/swift-proxy-server/Dockerfile b/docker/swift/swift-proxy-server/Dockerfile index c3fe8d87a..2c26802e3 100644 --- a/docker/swift/swift-proxy-server/Dockerfile +++ b/docker/swift/swift-proxy-server/Dockerfile @@ -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 |