From 861f55fbfd7558d56008e6275b0c6f5993346b95 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Wed, 19 Feb 2020 22:39:33 +0100 Subject: Add block labels to all Dockerfiles Change-Id: I9692dda817ef134d647247431565e1b58cf9da41 --- docker/cyborg/cyborg-agent/Dockerfile.j2 | 2 ++ docker/cyborg/cyborg-api/Dockerfile.j2 | 2 ++ docker/cyborg/cyborg-base/Dockerfile.j2 | 2 ++ docker/cyborg/cyborg-conductor/Dockerfile.j2 | 2 ++ 4 files changed, 8 insertions(+) (limited to 'docker/cyborg') diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index edd67e2b9..97e3790dd 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_agent_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 8e82f7179..71081f875 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_api_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 7e411b535..36b0aa007 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/docker/cyborg/cyborg-conductor/Dockerfile.j2 index de0211bda..51e562ca0 100644 --- a/docker/cyborg/cyborg-conductor/Dockerfile.j2 +++ b/docker/cyborg/cyborg-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block cyborg_conductor_header %}{% endblock %} -- cgit v1.2.3