diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-07 14:56:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-07 14:56:26 +0000 |
| commit | b43efe5377e60328183bf567504fc7b9ae9cbdeb (patch) | |
| tree | 537e8edb1d063778898e82d352f96824e001fb60 /docker/swift | |
| parent | 40130b2e7a591931ddac366dc6f8d085e1f83e37 (diff) | |
| parent | e5903d5fa9ef545595f7e98b73eb3bb31b72b4bb (diff) | |
| download | kolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.tar.gz kolla-b43efe5377e60328183bf567504fc7b9ae9cbdeb.zip | |
Merge "Remove include_header and include_footer in all Dockerfiles"
Diffstat (limited to 'docker/swift')
| -rw-r--r-- | docker/swift/swift-account/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-container/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-object-expirer/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-object/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-proxy-server/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/swift/swift-rsyncd/Dockerfile.j2 | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index f69a7317b..153555cc3 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_account_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index 8bc64b9ec..d1b038f5e 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_container_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 4ee5c8ec5..f16871648 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -20,6 +20,5 @@ MAINTAINER {{ maintainer }} {% block swift_object_expirer_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index 60bcc675f..ee7ff2346 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_object_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index d777a10cd..430fd4f5d 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -18,6 +18,5 @@ MAINTAINER {{ maintainer }} {% block swift_proxy_server_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index a34a646e8..d43efa177 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -17,6 +17,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start {% block swift_rsyncd_footer %}{% endblock %} {% block footer %}{% endblock %} -{{ include_footer }} USER swift |