Merge "Add custom footer section to final image Dockefiles"

2015-08-28 11:24:21 +00:00 · 2015-08-28 11:24:21 +00:00 · 2de7b141d2
commit 2de7b141d2
parent f895ee07cc 630f437576
64 changed files with 134 additions and 0 deletions
--- a/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2
@ -14,3 +14,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2
@ -14,3 +14,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2
@ -14,3 +14,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2
@ -14,3 +14,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2
@ -16,3 +16,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2
@ -14,3 +14,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/cinder/cinder-api/Dockerfile.j2
+++ b/docker_templates/cinder/cinder-api/Dockerfile.j2
@ -14,3 +14,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/cinder/cinder-backup/Dockerfile.j2
+++ b/docker_templates/cinder/cinder-backup/Dockerfile.j2
@ -5,3 +5,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/cinder/cinder-scheduler/Dockerfile.j2
+++ b/docker_templates/cinder/cinder-scheduler/Dockerfile.j2
@ -5,3 +5,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/cinder/cinder-volume/Dockerfile.j2
+++ b/docker_templates/cinder/cinder-volume/Dockerfile.j2
@ -15,3 +15,5 @@ COPY ./start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/data/Dockerfile.j2
+++ b/docker_templates/data/Dockerfile.j2
@ -2,3 +2,5 @@ FROM {{ base_distro }}:{{ base_distro_tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)

 CMD /bin/sleep infinity
+
+{{ include_footer }}
--- a/docker_templates/designate/designate-api/Dockerfile.j2
+++ b/docker_templates/designate/designate-api/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /start.sh
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker_templates/designate/designate-backend-bind9/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /start.sh
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/designate/designate-central/Dockerfile.j2
+++ b/docker_templates/designate/designate-central/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /start.sh
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/designate/designate-mdns/Dockerfile.j2
+++ b/docker_templates/designate/designate-mdns/Dockerfile.j2
@ -14,3 +14,5 @@ COPY start.sh /start.sh
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker_templates/designate/designate-poolmanager/Dockerfile.j2
@ -17,3 +17,5 @@ COPY start.sh /start.sh
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/designate/designate-sink/Dockerfile.j2
+++ b/docker_templates/designate/designate-sink/Dockerfile.j2
@ -16,3 +16,5 @@ COPY start.sh /start.sh
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/galera/Dockerfile.j2
+++ b/docker_templates/galera/Dockerfile.j2
@ -46,3 +46,5 @@ COPY config-external.sh /opt/kolla/
 COPY start.sh /

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/glance/glance-api/Dockerfile.j2
+++ b/docker_templates/glance/glance-api/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/glance/glance-registry/Dockerfile.j2
+++ b/docker_templates/glance/glance-registry/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
+++ b/docker_templates/gnocchi/gnocchi-api/Dockerfile.j2
@ -17,3 +17,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/gnocchi/gnocchi-statsd/Dockerfile.j2
+++ b/docker_templates/gnocchi/gnocchi-statsd/Dockerfile.j2
@ -14,3 +14,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/haproxy/Dockerfile.j2
+++ b/docker_templates/haproxy/Dockerfile.j2
@ -23,3 +23,5 @@ COPY start.sh /
 COPY config-external.sh ensure_latest_config.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker_templates/heat/heat-api-cfn/Dockerfile.j2
@ -21,3 +21,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/heat/heat-api/Dockerfile.j2
+++ b/docker_templates/heat/heat-api/Dockerfile.j2
@ -21,3 +21,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/heat/heat-engine/Dockerfile.j2
+++ b/docker_templates/heat/heat-engine/Dockerfile.j2
@ -24,3 +24,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/horizon/Dockerfile.j2
+++ b/docker_templates/horizon/Dockerfile.j2
@ -54,3 +54,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ironic/ironic-api/Dockerfile.j2
+++ b/docker_templates/ironic/ironic-api/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker_templates/ironic/ironic-conductor/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/ironic/ironic-discoverd/Dockerfile.j2
+++ b/docker_templates/ironic/ironic-discoverd/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/keepalived/Dockerfile.j2
+++ b/docker_templates/keepalived/Dockerfile.j2
@ -22,3 +22,5 @@ COPY start.sh check_alive.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/keystone/Dockerfile.j2
+++ b/docker_templates/keystone/Dockerfile.j2
@ -67,3 +67,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/kolla-ansible/Dockerfile.j2
+++ b/docker_templates/kolla-ansible/Dockerfile.j2
@ -34,3 +34,5 @@ RUN mkdir -p /etc/ansible /usr/share/ansible \
    && echo 'localhost ansible_connection=local' > /etc/ansible/hosts

 COPY kolla_keystone_service.py kolla_keystone_user.py /usr/share/ansible/
+
+{{ include_footer }}
--- a/docker_templates/magnum/magnum-api/Dockerfile.j2
+++ b/docker_templates/magnum/magnum-api/Dockerfile.j2
@ -15,3 +15,5 @@ COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]

+
+{{ include_footer }}
--- a/docker_templates/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker_templates/magnum/magnum-conductor/Dockerfile.j2
@ -19,3 +19,5 @@ COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]

+
+{{ include_footer }}
--- a/docker_templates/memcached/Dockerfile.j2
+++ b/docker_templates/memcached/Dockerfile.j2
@ -17,3 +17,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/mongodb/Dockerfile.j2
+++ b/docker_templates/mongodb/Dockerfile.j2
@ -21,3 +21,5 @@ VOLUME /data/db
 VOLUME /var/log/mongodb

 ENTRYPOINT exec /bin/mongod --dbpath /data/db --logpath /var/log/mongodb/mongo.log --noprealloc --smallfiles
+
+{{ include_footer }}
--- a/docker_templates/murano/murano-api/Dockerfile.j2
+++ b/docker_templates/murano/murano-api/Dockerfile.j2
@ -5,3 +5,5 @@ COPY config-external.sh /opt/kolla/
 COPY start.sh /

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/murano/murano-engine/Dockerfile.j2
+++ b/docker_templates/murano/murano-engine/Dockerfile.j2
@ -5,3 +5,5 @@ COPY config-external.sh /opt/kolla/
 COPY start.sh /

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/neutron/neutron-agents/Dockerfile.j2
+++ b/docker_templates/neutron/neutron-agents/Dockerfile.j2
@ -31,3 +31,5 @@ COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent
 COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent

 CMD ["/usr/bin/supervisord"]
+
+{{ include_footer }}
--- a/docker_templates/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker_templates/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@ -24,3 +24,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker_templates/neutron/neutron-openvswitch-agent/Dockerfile.j2
@ -28,3 +28,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/neutron/neutron-server/Dockerfile.j2
+++ b/docker_templates/neutron/neutron-server/Dockerfile.j2
@ -27,3 +27,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-api/Dockerfile.j2
+++ b/docker_templates/nova/nova-api/Dockerfile.j2
@ -14,3 +14,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-compute/Dockerfile.j2
+++ b/docker_templates/nova/nova-compute/Dockerfile.j2
@ -30,3 +30,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-conductor/Dockerfile.j2
+++ b/docker_templates/nova/nova-conductor/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-consoleauth/Dockerfile.j2
+++ b/docker_templates/nova/nova-consoleauth/Dockerfile.j2
@ -14,3 +14,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-libvirt/Dockerfile.j2
+++ b/docker_templates/nova/nova-libvirt/Dockerfile.j2
@ -28,3 +28,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-network/Dockerfile.j2
+++ b/docker_templates/nova/nova-network/Dockerfile.j2
@ -24,3 +24,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-novncproxy/Dockerfile.j2
+++ b/docker_templates/nova/nova-novncproxy/Dockerfile.j2
@ -30,3 +30,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/nova/nova-scheduler/Dockerfile.j2
+++ b/docker_templates/nova/nova-scheduler/Dockerfile.j2
@ -14,3 +14,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2
+++ b/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2
+++ b/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/rabbitmq/Dockerfile.j2
+++ b/docker_templates/rabbitmq/Dockerfile.j2
@ -23,3 +23,5 @@ COPY start.sh /
 COPY config-rabbit.sh config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-account-server/Dockerfile.j2
+++ b/docker_templates/swift/swift-account-server/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-container-server/Dockerfile.j2
+++ b/docker_templates/swift/swift-container-server/Dockerfile.j2
@ -15,3 +15,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-object-auditor/Dockerfile.j2
+++ b/docker_templates/swift/swift-object-auditor/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker_templates/swift/swift-object-expirer/Dockerfile.j2
@ -16,3 +16,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-object-replicator/Dockerfile.j2
+++ b/docker_templates/swift/swift-object-replicator/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-object-server/Dockerfile.j2
+++ b/docker_templates/swift/swift-object-server/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-object-updater/Dockerfile.j2
+++ b/docker_templates/swift/swift-object-updater/Dockerfile.j2
@ -5,3 +5,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker_templates/swift/swift-proxy-server/Dockerfile.j2
@ -12,3 +12,5 @@ RUN yum -y install openstack-swift-proxy && yum clean all
 COPY ./start.sh /start.sh
 COPY config-external.sh /opt/kolla/
 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/docker_templates/zaqar/Dockerfile.j2
+++ b/docker_templates/zaqar/Dockerfile.j2
@ -28,3 +28,5 @@ COPY start.sh /
 COPY config-external.sh /opt/kolla/

 CMD ["/start.sh"]
+
+{{ include_footer }}
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@ -249,6 +249,10 @@ def arg_parser():
                        help=('Path to custom file to be added at '
                              'beginning of base Dockerfile'),
                        type=str)
+    parser.add_argument('-I', '--include-footer',
+                        help=('Path to custom file to be added at '
+                              'end of Dockerfiles for final images'),
+                        type=str)
    return vars(parser.parse_args())


@ -281,6 +285,7 @@ class KollaWorker(object):
        self.config = ConfigParser.SafeConfigParser()
        self.config.read(os.path.join(self.base_dir, 'build.ini'))
        self.include_header = args['include_header']
+        self.include_footer = args['include_footer']
        self.regex = args['regex']

        self.image_statuses_bad = dict()
@ -320,6 +325,9 @@ class KollaWorker(object):
            if self.include_header:
                with open(self.include_header, 'r') as f:
                    values['include_header'] = f.read()
+            if self.include_footer:
+                with open(self.include_footer, 'r') as f:
+                    values['include_footer'] = f.read()
            content = template.render(values)
            with open(os.path.join(path, 'Dockerfile'), 'w') as f:
                f.write(content)