diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-08 14:23:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 14:23:58 -0400 |
| commit | 51a4f39bf097b6acef51b827f4dfe2212642b478 (patch) | |
| tree | dc6c091af739db2f09678500f4c3413164aada65 /images | |
| parent | 7c6d6a7e1bba389ebbeec5fd5170a8b8dff6c442 (diff) | |
| parent | 32b7b0aba720502c528d38af74a7b6163d0ec6fa (diff) | |
| download | openshift-51a4f39bf097b6acef51b827f4dfe2212642b478.tar.gz openshift-51a4f39bf097b6acef51b827f4dfe2212642b478.tar.bz2 openshift-51a4f39bf097b6acef51b827f4dfe2212642b478.tar.xz openshift-51a4f39bf097b6acef51b827f4dfe2212642b478.zip | |
Merge pull request #4330 from codificat/20170531-image-rename
Merged by openshift-bot
Diffstat (limited to 'images')
| -rw-r--r-- | images/installer/Dockerfile | 6 | ||||
| -rw-r--r-- | images/installer/Dockerfile.rhel7 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile index 880726a82..915dfe377 100644 --- a/images/installer/Dockerfile +++ b/images/installer/Dockerfile @@ -1,11 +1,11 @@ # Using playbook2image as a base -# See https://github.com/aweiteka/playbook2image for details on the image +# See https://github.com/openshift/playbook2image for details on the image # including documentation for the settings/env vars referenced below -FROM docker.io/aweiteka/playbook2image:latest +FROM registry.centos.org/openshift/playbook2image:latest MAINTAINER OpenShift Team <dev@lists.openshift.redhat.com> -LABEL name="openshift-ansible" \ +LABEL name="openshift/origin-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" \ url="https://github.com/openshift/openshift-ansible" \ diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7 index 00841e660..9d7eeec24 100644 --- a/images/installer/Dockerfile.rhel7 +++ b/images/installer/Dockerfile.rhel7 @@ -2,7 +2,7 @@ FROM openshift3/playbook2image MAINTAINER OpenShift Team <dev@lists.openshift.redhat.com> -LABEL name="openshift3/openshift-ansible" \ +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" \ url="https://github.com/openshift/openshift-ansible" \ |