From 96b9bd6ab643218668674df909737ff62efb4793 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 7 Jan 2019 16:00:45 -0500 Subject: [PATCH] make py3 packaging work for k8s --- installer/roles/image_build/templates/Dockerfile.j2 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index dca95c86c0..a1abb22a67 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -31,12 +31,15 @@ RUN chgrp -Rf root /var/lib/awx && chmod -Rf g+w /var/lib/awx RUN yum -y install epel-release && \ yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm && \ yum -y update && \ - yum -y install ansible git mercurial subversion curl python-psycopg2 python-pip python-setuptools libselinux-python setools-libs yum-utils sudo acl make postgresql-devel nginx python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap gcc-c++ python-devel krb5-workstation krb5-libs python-crypto libcurl-devel rsync unzip && \ + yum -y install ansible git mercurial subversion curl python-psycopg2 python-pip python-setuptools libselinux-python setools-libs yum-utils sudo acl make postgresql-devel nginx python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel bubblewrap gcc-c++ python-devel python36 python36-devel krb5-workstation krb5-libs libcurl-devel rsync unzip && \ + ln -s /usr/bin/python36 /usr/bin/python3 && \ + python36 -m ensurepip && \ + pip3 install virtualenv && \ pip install virtualenv supervisor && \ CFLAGS="-DXMLSEC_NO_SIZE_T" \ VENV_BASE=/var/lib/awx/venv make requirements_ansible && \ VENV_BASE=/var/lib/awx/venv make requirements_awx && \ - yum -y remove gcc postgresql-devel libxml2-devel libxslt-devel cyrus-sasl-devel openldap-devel xmlsec1-devel krb5-devel xmlsec1-openssl-devel libtool-ltdl-devel gcc-c++ python-devel && \ + yum -y remove gcc postgresql-devel libxml2-devel libxslt-devel cyrus-sasl-devel openldap-devel xmlsec1-devel krb5-devel xmlsec1-openssl-devel libtool-ltdl-devel gcc-c++ python-devel python36-devel && \ yum -y clean all && \ rm -rf /root/.cache