aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2020-02-19 22:39:33 +0100
committerChristian Berendt <berendt@betacloud-solutions.de>2020-03-01 17:25:58 +0000
commit861f55fbfd7558d56008e6275b0c6f5993346b95 (patch)
tree437d4aea63cc00510b9f9a8ff256b522eed5f6ca /docker/swift
parentfecd325c67fb7700d86f682be57c1ef456ed7707 (diff)
downloadkolla-861f55fbfd7558d56008e6275b0c6f5993346b95.tar.gz
kolla-861f55fbfd7558d56008e6275b0c6f5993346b95.zip
Add block labels to all Dockerfiles
Change-Id: I9692dda817ef134d647247431565e1b58cf9da41
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-account/Dockerfile.j22
-rw-r--r--docker/swift/swift-base/Dockerfile.j22
-rw-r--r--docker/swift/swift-container/Dockerfile.j22
-rw-r--r--docker/swift/swift-object-expirer/Dockerfile.j22
-rw-r--r--docker/swift/swift-object/Dockerfile.j22
-rw-r--r--docker/swift/swift-proxy-server/Dockerfile.j22
-rw-r--r--docker/swift/swift-rsyncd/Dockerfile.j22
7 files changed, 14 insertions, 0 deletions
diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2
index dee2a1f7a..8ad7ce9f6 100644
--- a/docker/swift/swift-account/Dockerfile.j2
+++ b/docker/swift/swift-account/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block swift_account_header %}{% endblock %}
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index fbf4b3556..98940dfac 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-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 swift_base_header %}{% endblock %}
diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2
index 645660b81..4d8532f72 100644
--- a/docker/swift/swift-container/Dockerfile.j2
+++ b/docker/swift/swift-container/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block swift_container_header %}{% endblock %}
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index bbca2617a..dac92d375 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block swift_object_expirer_header %}{% endblock %}
diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2
index 8f0c5f0e0..67040e51e 100644
--- a/docker/swift/swift-object/Dockerfile.j2
+++ b/docker/swift/swift-object/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block swift_object_header %}{% endblock %}
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index 3ed6b965a..b7d0f0bca 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block swift_proxy_server_header %}{% endblock %}
diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2
index b4c49c85b..b46e5e4cf 100644
--- a/docker/swift/swift-rsyncd/Dockerfile.j2
+++ b/docker/swift/swift-rsyncd/Dockerfile.j2
@@ -1,5 +1,7 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
+{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
{% block swift_rsyncd_header %}{% endblock %}