diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-28 11:24:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-28 11:24:22 +0000 |
| commit | 2de7b141d25d360edf6833b8a0d8440413812eb6 (patch) | |
| tree | b8584fdaf95eab6752e1d9de953dc2f873c56345 /docker_templates/swift | |
| parent | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (diff) | |
| parent | 630f437576c81c829f6d74cc33dcf830bbc89bef (diff) | |
| download | kolla-2de7b141d25d360edf6833b8a0d8440413812eb6.tar.gz kolla-2de7b141d25d360edf6833b8a0d8440413812eb6.zip | |
Merge "Add custom footer section to final image Dockefiles"
Diffstat (limited to 'docker_templates/swift')
8 files changed, 16 insertions, 0 deletions
diff --git a/docker_templates/swift/swift-account-server/Dockerfile.j2 b/docker_templates/swift/swift-account-server/Dockerfile.j2 index 809091d4d..7320de9f4 100644 --- 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 }} diff --git a/docker_templates/swift/swift-container-server/Dockerfile.j2 b/docker_templates/swift/swift-container-server/Dockerfile.j2 index b4b43d8dc..1a08c0f5d 100644 --- 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 }} diff --git a/docker_templates/swift/swift-object-auditor/Dockerfile.j2 b/docker_templates/swift/swift-object-auditor/Dockerfile.j2 index 637501586..ab8a7adee 100644 --- 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 }} diff --git a/docker_templates/swift/swift-object-expirer/Dockerfile.j2 b/docker_templates/swift/swift-object-expirer/Dockerfile.j2 index 8b211f2e4..af9f3eb58 100644 --- 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 }} diff --git a/docker_templates/swift/swift-object-replicator/Dockerfile.j2 b/docker_templates/swift/swift-object-replicator/Dockerfile.j2 index 637501586..ab8a7adee 100644 --- 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 }} diff --git a/docker_templates/swift/swift-object-server/Dockerfile.j2 b/docker_templates/swift/swift-object-server/Dockerfile.j2 index 637501586..ab8a7adee 100644 --- 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 }} diff --git a/docker_templates/swift/swift-object-updater/Dockerfile.j2 b/docker_templates/swift/swift-object-updater/Dockerfile.j2 index 637501586..ab8a7adee 100644 --- 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 }} diff --git a/docker_templates/swift/swift-proxy-server/Dockerfile.j2 b/docker_templates/swift/swift-proxy-server/Dockerfile.j2 index b668f33e2..54d024f8b 100644 --- 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 }} |