summaryrefslogtreecommitdiffstats
path: root/images/installer/Dockerfile
Commit message (Collapse)AuthorAgeFilesLines
* Origin image build: add oc clientLuke Meyer2017-08-041-3/+6
| | | | | | | | | The oc client was left out with the move away from playbook2image. However it is needed in the image for the `oc cluster up` use case for installing logging or metrics. This change adds oc via the latest signed and released client RPM, which requires adding the centos-openshift-origin repo to the image.
* image builds: remove dependency on playbook2imagejuanvallejo2017-07-181-35/+27
| | | | | | We do not need the builder functionality from playbook2image and the resulting image was overly complicated, so this simply builds on Centos/RHEL.
* Merge pull request #4330 from codificat/20170531-image-renameOpenShift Bot2017-06-081-3/+3
|\ | | | | Merged by openshift-bot
| * Rename container image to origin-ansible / ose-ansiblePep TurrĂ³ Mauri2017-06-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | fix up openshift-ansible for use with 'oc cluster up'Jeff Cantrill2017-06-061-1/+1
|/
* Fix container image build referencesPep TurrĂ³ Mauri2017-05-121-1/+1
| | | | | | | | | Updating some files to account for recent changes: - Commit fbadeb4 moved the location of the Dockerfiles - playbook2image is now available from the openshift org - downstream image is building with boto 2.34 Adjusting image build scripts and documentation to match these changes.
* Moving Dockerfile content to images dirjupierce2017-05-081-0/+51