diff options
| author | Chen <dstbtgagt@foxmail.com> | 2017-04-18 17:20:03 +0900 |
|---|---|---|
| committer | Chen <dstbtgagt@foxmail.com> | 2017-04-20 16:50:05 +0900 |
| commit | 8c463a47a9c988df70046f7d343af0441bf29f4d (patch) | |
| tree | 7d8c02b341152be4b843df788af4b3c50e200f1b /docker/watcher | |
| parent | bf84c20e8f7b9eed03275ece9d492492e2c00c62 (diff) | |
| download | kolla-8c463a47a9c988df70046f7d343af0441bf29f4d.tar.gz kolla-8c463a47a9c988df70046f7d343af0441bf29f4d.zip | |
Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
Use LABEL instruction instead of MAINTAINER (deprecated) instruc-
tion as suggested by Docker's official dockerfile guide.
docs.docker.com/engine/reference/builder/#maintainer-deprecated
Closes-Bug: #1683652
Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
Diffstat (limited to 'docker/watcher')
| -rw-r--r-- | docker/watcher/watcher-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-applier/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/watcher/watcher-engine/Dockerfile.j2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index 363462e44..128d227e7 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_api_header %}{% endblock %} diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index cb92e6e66..0a8244235 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_applier_header %}{% endblock %} diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 48c0c8473..817888934 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_base_header %}{% endblock %} diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index 30f27a122..b6724815e 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block watcher_engine_header %}{% endblock %} |