diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-12 06:37:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 06:37:51 -0400 |
| commit | 1da90af63656f127b21720248b5c8c25ebc728ed (patch) | |
| tree | 34e1726b26d921df72583a16a1548d11973b0117 /images | |
| parent | 0d0c6d15d5d413ebefe31370a5c9ad5f0d7bada0 (diff) | |
| parent | 1c213b51468fa698acb08d18ce5d6b2a5796d93d (diff) | |
| download | openshift-1da90af63656f127b21720248b5c8c25ebc728ed.tar.gz openshift-1da90af63656f127b21720248b5c8c25ebc728ed.tar.bz2 openshift-1da90af63656f127b21720248b5c8c25ebc728ed.tar.xz openshift-1da90af63656f127b21720248b5c8c25ebc728ed.zip | |
Merge pull request #4737 from sosiouxme/20170711-consolidate-small-prs
Merged by openshift-bot
Diffstat (limited to 'images')
| -rw-r--r-- | images/installer/Dockerfile.rhel7 | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7 index 9d7eeec24..f861d4bcf 100644 --- a/images/installer/Dockerfile.rhel7 +++ b/images/installer/Dockerfile.rhel7 @@ -2,16 +2,20 @@ 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" \ - version="v3.4.1" \ + version="v3.6.0" \ release="1" \ architecture="x86_64" @@ -20,13 +24,18 @@ LABEL name="openshift3/ose-ansible" \ # because all content and dependencies (like 'oc') is already # installed via yum. USER root -RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto" && \ +RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto skopeo openssl java-1.8.0-openjdk-headless httpd-tools" && \ yum repolist > /dev/null && \ - yum-config-manager --enable rhel-7-server-ose-3.4-rpms && \ + yum-config-manager --enable rhel-7-server-ose-3.6-rpms && \ yum-config-manager --enable rhel-7-server-rh-common-rpms && \ yum install -y $INSTALL_PKGS && \ yum clean all +# The symlinks below are a (hopefully temporary) hack to work around the fact that this +# image is based on python s2i which uses the python27 SCL instead of system python, +# and so the system python modules we need would otherwise not be in the path. +RUN ln -s /usr/lib/python2.7/site-packages/{boto,passlib} /opt/app-root/lib64/python2.7/ + USER ${USER_UID} # The playbook to be run is specified via the PLAYBOOK_FILE env var. @@ -36,6 +45,7 @@ USER ${USER_UID} # $APP_HOME by the 'assemble' script, we set the WORK_DIR env var to the # location of openshift-ansible. ENV PLAYBOOK_FILE=playbooks/byo/openshift_facts.yml \ + ANSIBLE_CONFIG=/usr/share/atomic-openshift-utils/ansible.cfg \ WORK_DIR=/usr/share/ansible/openshift-ansible \ OPTS="-v" |