diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-08 21:33:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-08 21:33:04 +0000 |
| commit | 5841abe910c50d34fbbf4dcfde7b6e92dd82bdae (patch) | |
| tree | f36a0b490406bdc99ae5090d2fd782e7dc8fd08e /docker/kube | |
| parent | 9751b32a7b37e12fab19a6a99c98c4c58f348a6d (diff) | |
| parent | 31259fa595392c25a5e21d03c13e8896648a7695 (diff) | |
| download | kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.tar.gz kolla-5841abe910c50d34fbbf4dcfde7b6e92dd82bdae.zip | |
Merge "Override image's meta info."
Diffstat (limited to 'docker/kube')
| -rw-r--r-- | docker/kube/kube-apiserver-amd64/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kube/kube-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kube/kube-controller-manager-amd64/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kube/kube-discovery-amd64/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kube/kube-proxy-amd64/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kube/kube-scheduler-amd64/Dockerfile.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/kube/kube-apiserver-amd64/Dockerfile.j2 b/docker/kube/kube-apiserver-amd64/Dockerfile.j2 index 86cd20263..de522ff66 100644 --- a/docker/kube/kube-apiserver-amd64/Dockerfile.j2 +++ b/docker/kube/kube-apiserver-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" ENV KUBERNETES_COMPONENT=kube-apiserver diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2 index 6f6e64bab..907bef68e 100644 --- a/docker/kube/kube-base/Dockerfile.j2 +++ b/docker/kube/kube-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" ENV KUBERNETES_VERSION=v1.5.4 diff --git a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 index abbb84ba8..452a936f4 100644 --- a/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 +++ b/docker/kube/kube-controller-manager-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" ENV KUBERNETES_COMPONENT=kube-controller-manager diff --git a/docker/kube/kube-discovery-amd64/Dockerfile.j2 b/docker/kube/kube-discovery-amd64/Dockerfile.j2 index f8bfeff11..b347525c0 100644 --- a/docker/kube/kube-discovery-amd64/Dockerfile.j2 +++ b/docker/kube/kube-discovery-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" ENV KUBERNETES_COMPONENT=kube-discovery diff --git a/docker/kube/kube-proxy-amd64/Dockerfile.j2 b/docker/kube/kube-proxy-amd64/Dockerfile.j2 index 234bdb8d6..aff253b66 100644 --- a/docker/kube/kube-proxy-amd64/Dockerfile.j2 +++ b/docker/kube/kube-proxy-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" ENV KUBERNETES_COMPONENT=kube-proxy diff --git a/docker/kube/kube-scheduler-amd64/Dockerfile.j2 b/docker/kube/kube-scheduler-amd64/Dockerfile.j2 index 5a8579d81..d1babfb78 100644 --- a/docker/kube/kube-scheduler-amd64/Dockerfile.j2 +++ b/docker/kube/kube-scheduler-amd64/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}kube-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" ENV KUBERNETES_COMPONENT=kube-scheduler |