Allow changing base image

By changing the PREFIX variable in the .buildconf one is now able to build docker images from different bases. For example, add the following line to your .buildconf file to build CentOS based images: PREFIX=centos-rdo- Default base image is Fedora. For now only RH family is supported. Additionally, changing the namespace either with the NAMESPACE variable in .buildconf or via --namespace commandline option now changes the source namespace as well from the default kollaglue one. Implements: blueprint multi-baseos Co-Authored-By: Steven Dake <stdake@cisco.com> Change-Id: I3964cd2292789ea883a1f2d2738a5731a4fff49b
2015-02-26 15:00:42 +09:00 · 2015-02-26 15:00:42 +09:00 · 0764fd7dea
commit 0764fd7dea
parent 5052e54f45
42 changed files with 65 additions and 57 deletions
--- a/docker/barbican/Dockerfile
+++ b/docker/barbican/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 ADD ./start.sh /start.sh
--- a/docker/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/ceilometer/ceilometer-alarm/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum install -y openstack-ceilometer-alarm && yum clean all
--- a/docker/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/ceilometer/ceilometer-api/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum install -y openstack-ceilometer-api && yum clean all
--- a/docker/ceilometer/ceilometer-base/Dockerfile
+++ b/docker/ceilometer/ceilometer-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 mkdir -p /opt/kolla
--- a/docker/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/ceilometer/ceilometer-central/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum install -y openstack-ceilometer-central && yum clean all
--- a/docker/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/ceilometer/ceilometer-collector/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum install -y openstack-ceilometer-collector && yum clean all
--- a/docker/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
--- a/docker/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-ceilometer-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum install -y openstack-ceilometer-notification && yum clean all
--- a/docker/cinder/Dockerfile
+++ b/docker/cinder/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-cinder && yum clean all
--- a/docker/glance/glance-api/Dockerfile
+++ b/docker/glance/glance-api/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 VOLUME /var/lib/glance
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/glance/glance-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-glance ; yum clean all
--- a/docker/glance/glance-registry/Dockerfile
+++ b/docker/glance/glance-registry/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-glance-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 ADD ./start.sh /start.sh
--- a/docker/heat/heat-api/Dockerfile
+++ b/docker/heat/heat-api/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 # TODO: configure cfn and cloudwatch
--- a/docker/heat/heat-base/Dockerfile
+++ b/docker/heat/heat-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 mkdir -p /opt/kolla
--- a/docker/heat/heat-engine/Dockerfile
+++ b/docker/heat/heat-engine/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-heat-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN yum -y install \
--- a/docker/horizon/Dockerfile
+++ b/docker/horizon/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 \
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 #Install required packages
--- a/docker/mariadb/Dockerfile
+++ b/docker/mariadb/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 mariadb-galera-server; yum clean all
--- a/docker/mongodb/Dockerfile
+++ b/docker/mongodb/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 mongodb mongodb-server; yum clean all
--- a/docker/neutron/agents/dhcp/Dockerfile
+++ b/docker/neutron/agents/dhcp/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 # Install required packages
--- a/docker/neutron/agents/l3/Dockerfile
+++ b/docker/neutron/agents/l3/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 # Install required packages
--- a/docker/neutron/agents/linux-bridge/Dockerfile
+++ b/docker/neutron/agents/linux-bridge/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 # Install required packages
--- a/docker/neutron/agents/metadata/Dockerfile
+++ b/docker/neutron/agents/metadata/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 # Install required packages
--- a/docker/neutron/neutron-base/Dockerfile
+++ b/docker/neutron/neutron-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-neutron-ml2 ; yum clean all
--- a/docker/neutron/neutron-server/Dockerfile
+++ b/docker/neutron/neutron-server/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-neutron-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 #Install required packages
--- a/docker/nova-base/Dockerfile
+++ b/docker/nova-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-nova-common \
--- a/docker/nova-compute/nova-compute/Dockerfile
+++ b/docker/nova-compute/nova-compute/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 openstack-nova-compute \
--- a/docker/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/nova-compute/nova-libvirt/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 libvirt-daemon-driver-* libvirt-daemon libvirt-daemon-kvm qemu-kvm && yum clean all
--- a/docker/nova-compute/nova-network/Dockerfile
+++ b/docker/nova-compute/nova-network/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 openstack-nova-network \
--- 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 \
--- 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 \
--- 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 \
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 # Install required packages
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/docker/zaqar/Dockerfile
+++ b/docker/zaqar/Dockerfile
@ -1,4 +1,4 @@
-FROM kollaglue/fedora-rdo-base
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora-21/openstack-zaqar-2014.2-1.fc22.noarch.rpm
--- a/docs/image-building.md
+++ b/docs/image-building.md
@ -37,21 +37,6 @@ commands:

    $ docker run kollaglue/fedora-rdo-keystone:76a1602

-Or in your kubernetes configurations:
-
-    "containers": [{
-      "name": "keystone",
-      "image": "kollaglue/fedora-rdo-keystone:76a1602",
-      "ports": [
-        {"containerPort": 5000},
-        {"containerPort": 35357}
-      ],
-      "env": [
-        {"name": "DB_ROOT_PASSWORD", "value": "password"},
-        {"name": "KEYSTONE_ADMIN_TOKEN", "value": "ADMINTOKEN"}
-      ]
-    }]
-
 ## Building releases

 To build into the `latest` tag, add `--release`:
@ -62,14 +47,31 @@ Or to build and push:

    $ ./build --push --release

+## Build all images at once
+
+The `build-all-docker-images` script in the tools directory is a wrapper for
+the `build-docker-image` that builds all images, as the name suggests, in the
+correct order. It responds to the same options as `build-docker-image` with the
+additional `--from` and `--to` options that allows building only images that
+have changed between the specified git revisions.
+
+For example, to build all images contained in docker directory and push new release:
+
+    $ tools/build-all-docker-images --release --push
+
+To build only images modified in test-branch along with their children:
+
+    $ tools/build-all-docker-images --from master --to test-branch
+
 ## Configuration

 The `build-docker-image` script will look for a file named `.buildconf`
-in your current directory and in the top level of the repository.  You
+in the image directory and in the top level of the repository.  You
 can use this to set defaults, such as:

    NAMESPACE=larsks
+    PREFIX=centos-rdo-

-This setting would cause all images to be tagged into the `larsks/`
-namespace.
+This setting would cause images to be tagged into the `larsks/`
+namespace and use CentOS as base image instead of the default Fedora.

--- a/tools/build-all-docker-images
+++ b/tools/build-all-docker-images
@ -70,6 +70,8 @@ function init_image {

    local image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}"
    local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' )
+    base_image=${base_image//%%KOLLA_NAMESPACE%%/$NAMESPACE}
+    base_image=${base_image//%%KOLLA_PREFIX%%/$PREFIX}

    img_dirs[$image]=$img_dir
    dependency[$image]=$base_image
--- a/tools/build-docker-image
+++ b/tools/build-docker-image
@ -90,6 +90,10 @@ fi

 TMPDIR=$(mktemp -d /tmp/output.XXXXXXXXXX)
 cp -aL $IMGDIR/* $TMPDIR
+# Use an extension for in-place editing for portability, as GNU and BSD
+# versions of sed behave differently otherwise
+sed -i.bak "s/%%KOLLA_NAMESPACE%%/${NAMESPACE}/g" $TMPDIR/Dockerfile
+sed -i.bak "s/%%KOLLA_PREFIX%%/${PREFIX}/g" $TMPDIR/Dockerfile

 if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then
    echo "ERROR: failed to build $FULLIMAGE"