From 23946219b23a416a4a2bbf4ebc14d6e02a9c2709 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 7 Jul 2017 12:22:30 -0400 Subject: OCP build: override python-directed envvars SUMMARY and DESCRIPTION were coming from python image build, might be confusing to someone inspecting this image. --- images/installer/Dockerfile.rhel7 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'images') diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7 index 2f684dc47..f861d4bcf 100644 --- a/images/installer/Dockerfile.rhel7 +++ b/images/installer/Dockerfile.rhel7 @@ -2,12 +2,16 @@ FROM openshift3/playbook2image MAINTAINER OpenShift Team +# override env vars from base image +ENV SUMMARY="OpenShift's installation and configuration tool" \ + DESCRIPTION="A containerized openshift-ansible image to let you run playbooks to install, upgrade, maintain and check an OpenShift cluster" + LABEL name="openshift3/ose-ansible" \ - summary="OpenShift's installation and configuration tool" \ - description="A containerized openshift-ansible image to let you run playbooks to install, upgrade, maintain and check an OpenShift cluster" \ + summary="$SUMMARY" \ + description="$DESCRIPTION" \ url="https://github.com/openshift/openshift-ansible" \ io.k8s.display-name="openshift-ansible" \ - io.k8s.description="A containerized openshift-ansible image to let you run playbooks to install, upgrade, maintain and check an OpenShift cluster" \ + io.k8s.description="$DESCRIPTION" \ io.openshift.expose-services="" \ io.openshift.tags="openshift,install,upgrade,ansible" \ com.redhat.component="aos3-installation-docker" \ -- cgit v1.2.1