diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 12:32:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 12:32:55 +0000 |
| commit | b9e320a7cd23c282494f25ce1c0427dd6201b9b6 (patch) | |
| tree | 54ce933ba2259d22f9d8ac0c8c7efbc0437a23c6 /docker/ironic | |
| parent | 723790fc9f84c130debd0af658471a70b459fd65 (diff) | |
| parent | 8c463a47a9c988df70046f7d343af0441bf29f4d (diff) | |
| download | kolla-b9e320a7cd23c282494f25ce1c0427dd6201b9b6.tar.gz kolla-b9e320a7cd23c282494f25ce1c0427dd6201b9b6.zip | |
Merge "Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2"
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index fc86e7b46..48b9c89cc 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_api_header %}{% endblock %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 99d452906..169043a00 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_base_header %}{% endblock %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 3da04baba..a9bd1e511 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_conductor_header %}{% endblock %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index bfb23b0c4..5edf53b2e 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} -MAINTAINER {{ maintainer }} +LABEL maintainer="{{ maintainer }}" {% block ironic_pxe_header %}{% endblock %} |