From 2a29ad2ce0639f6141f2dc53d176c12c2ed599c1 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 7 Jul 2017 12:29:34 -0400 Subject: OCP build: sync packages needed sync the parallel change from Dockerfile into Dockerfile.rhel7 --- images/installer/Dockerfile.rhel7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'images') diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7 index 9d7eeec24..10eaf9066 100644 --- a/images/installer/Dockerfile.rhel7 +++ b/images/installer/Dockerfile.rhel7 @@ -20,7 +20,7 @@ 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-rh-common-rpms && \ -- cgit v1.2.3 From 6ecdf0d028db1add6e07ed7461c2b55a0487b8ca Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 7 Jul 2017 11:55:55 -0400 Subject: OCP build: fix bug 1465724 https://bugzilla.redhat.com/show_bug.cgi?id=1465724 Use the provided ansible.cfg and hack needed python system libs into SCL --- images/installer/Dockerfile.rhel7 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'images') diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7 index 10eaf9066..2f684dc47 100644 --- a/images/installer/Dockerfile.rhel7 +++ b/images/installer/Dockerfile.rhel7 @@ -11,7 +11,7 @@ LABEL name="openshift3/ose-ansible" \ 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" @@ -22,11 +22,16 @@ LABEL name="openshift3/ose-ansible" \ USER root 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 +41,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" -- cgit v1.2.3 From 23946219b23a416a4a2bbf4ebc14d6e02a9c2709 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 7 Jul 2017 12:22:30 -0400 Subject: OCP build: override python-directed envvars SUMMARY and DESCRIPTION were coming from python image build, might be confusing to someone inspecting this image. --- images/installer/Dockerfile.rhel7 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'images') 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 +# 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" \ -- cgit v1.2.3