diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-02 12:26:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-02 12:26:57 +0000 |
| commit | 3fe2ae7849ef963227b1cd46c5b13d646de789c3 (patch) | |
| tree | c194e30e63570fad715b0bcedd8194d238424ab9 /docker/solum | |
| parent | 9c0cfce9f32da87b395c916919bec054d744f311 (diff) | |
| parent | 861f55fbfd7558d56008e6275b0c6f5993346b95 (diff) | |
| download | kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.tar.gz kolla-3fe2ae7849ef963227b1cd46c5b13d646de789c3.zip | |
Merge "Add block labels to all Dockerfiles"
Diffstat (limited to 'docker/solum')
| -rw-r--r-- | docker/solum/solum-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-deployer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/solum/solum-worker/Dockerfile.j2 | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/docker/solum/solum-api/Dockerfile.j2 b/docker/solum/solum-api/Dockerfile.j2 index 0373a025f..c47460543 100644 --- a/docker/solum/solum-api/Dockerfile.j2 +++ b/docker/solum/solum-api/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_api_header %}{% endblock %} diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index fed722d78..9a7d252ad 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-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 solum_base_header %}{% endblock %} diff --git a/docker/solum/solum-conductor/Dockerfile.j2 b/docker/solum/solum-conductor/Dockerfile.j2 index 7a4765a7d..28298a7d1 100644 --- a/docker/solum/solum-conductor/Dockerfile.j2 +++ b/docker/solum/solum-conductor/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_conductor_header %}{% endblock %} diff --git a/docker/solum/solum-deployer/Dockerfile.j2 b/docker/solum/solum-deployer/Dockerfile.j2 index eebb436a9..d8998572e 100644 --- a/docker/solum/solum-deployer/Dockerfile.j2 +++ b/docker/solum/solum-deployer/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_deployer_header %}{% endblock %} diff --git a/docker/solum/solum-worker/Dockerfile.j2 b/docker/solum/solum-worker/Dockerfile.j2 index 9c3147049..69d02de28 100644 --- a/docker/solum/solum-worker/Dockerfile.j2 +++ b/docker/solum/solum-worker/Dockerfile.j2 @@ -1,5 +1,7 @@ FROM {{ namespace }}/{{ image_prefix }}solum-base:{{ tag }} +{% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +{% endblock %} {% block solum_worker_header %}{% endblock %} |