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/nova | |
| 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/nova')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-consoleauth/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-placement-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-scheduler/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-serialproxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index e31d7abc2..966fdbb99 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_api_header %}{% endblock %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index c3bc21d89..e4f4652a2 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_base_header %}{% endblock %} diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index 04ba49070..947d84257 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_compute_ironic_header %}{% endblock %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 256c92d23..a2109dc7f 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_compute_header %}{% endblock %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index b2c1cc23e..8c5ce5d1d 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_conductor_header %}{% endblock %} diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index b80a68329..6f4af35b0 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_consoleauth_header %}{% endblock %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 7adb7ba3a..5d1024961 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_libvirt_header %}{% endblock %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 62cc9b5f3..0091e7aa8 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_novncproxy_header %}{% endblock %} diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2 index 69405dee2..20293a1a5 100644 --- a/docker/nova/nova-placement-api/Dockerfile.j2 +++ b/docker/nova/nova-placement-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_placement_api_header %}{% endblock %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index f7ddb228f..7d4fdc7b8 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_scheduler_header %}{% endblock %} diff --git a/docker/nova/nova-serialproxy/Dockerfile.j2 b/docker/nova/nova-serialproxy/Dockerfile.j2 index a0f222886..558dd0191 100644 --- a/docker/nova/nova-serialproxy/Dockerfile.j2 +++ b/docker/nova/nova-serialproxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_serialproxy_header %}{% endblock %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 88e6c3aa9..eb4277181 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_spicehtml5proxy_header %}{% endblock %} diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index bbee5dbe3..530e46aea 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block nova_ssh_header %}{% endblock %} |
