diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 05:16:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 05:16:11 +0000 |
| commit | ba32530faca434c0ef7ca3290b9bf17825342694 (patch) | |
| tree | 2c2342f3be779a26e93023c026d93cd5fb6445f3 /docker/swift | |
| parent | ae9c246315d72f5acb724b9fa93886cc30b48cec (diff) | |
| parent | b41247c6569974d8b8591070076845e652d684ba (diff) | |
| download | kolla-ba32530faca434c0ef7ca3290b9bf17825342694.tar.gz kolla-ba32530faca434c0ef7ca3290b9bf17825342694.zip | |
Merge "Add header blocks to all Dockerfiles"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-account/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-container/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-object/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/Dockerfile.j2 | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index dacde88b0..640475977 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_account_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 5fe04a0a2..a4fdb533d 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index c59cac0e9..c03c2e6fd 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_container_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index d575af047..4edb02d4e 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_object_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 54895ff65..ae01f71c6 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_proxy_server_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index b85a7a492..7f781700c 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_rsyncd_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} |