diff options
| author | Pep Turró Mauri <pep@redhat.com> | 2017-05-31 18:52:22 +0200 |
|---|---|---|
| committer | Pep Turró Mauri <pep@redhat.com> | 2017-06-02 12:31:50 +0200 |
| commit | 32b7b0aba720502c528d38af74a7b6163d0ec6fa (patch) | |
| tree | 54b5679a6f1307ce427224147987ab7f83d947c9 /images | |
| parent | d175973070a4dce2055678f9309d2f74517d461e (diff) | |
| download | openshift-32b7b0aba720502c528d38af74a7b6163d0ec6fa.tar.gz openshift-32b7b0aba720502c528d38af74a7b6163d0ec6fa.tar.bz2 openshift-32b7b0aba720502c528d38af74a7b6163d0ec6fa.tar.xz openshift-32b7b0aba720502c528d38af74a7b6163d0ec6fa.zip | |
Rename container image to origin-ansible / ose-ansible
As discussed in #4279 the container image is being renamed to
openshift/origin-ansible (upstream) and openshift3/ose-ansible (downstream) for
the "oc cluster up" use case, and more generally to make it fit the
imageConfig.format configuration option.
This updates references to the image name accordingly.
Also updating references to playbook2image to account for recent moves of the
repo/image.
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 f6af018ca..554e99c52 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" \ |