diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-07-07 12:22:30 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-07-11 13:26:00 -0400 |
| commit | 23946219b23a416a4a2bbf4ebc14d6e02a9c2709 (patch) | |
| tree | 83e4a80993bf2464eebbf1a509c4f66baf2ee302 | |
| parent | 6ecdf0d028db1add6e07ed7461c2b55a0487b8ca (diff) | |
| download | openshift-23946219b23a416a4a2bbf4ebc14d6e02a9c2709.tar.gz openshift-23946219b23a416a4a2bbf4ebc14d6e02a9c2709.tar.bz2 openshift-23946219b23a416a4a2bbf4ebc14d6e02a9c2709.tar.xz openshift-23946219b23a416a4a2bbf4ebc14d6e02a9c2709.zip | |
OCP build: override python-directed envvars
SUMMARY and DESCRIPTION were coming from python image build, might be
confusing to someone inspecting this image.
| -rw-r--r-- | images/installer/Dockerfile.rhel7 | 10 |
1 files changed, 7 insertions, 3 deletions
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 <dev@lists.openshift.redhat.com> +# 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" \ |