From 97e030dd1ffbf5a656fe34605eee537b191e02d3 Mon Sep 17 00:00:00 2001 From: Uriel Mandujano Date: Sat, 6 Apr 2019 11:10:35 -0500 Subject: [PATCH] Revert "Removes failing symlink to /usr/bin/python3 because that file already exists" This reverts commit 13fadd38380c1e2b7f8f587f90a43e11987e78af. --- installer/roles/image_build/files/Dockerfile.sdist | 2 ++ installer/roles/image_build/templates/Dockerfile.j2 | 1 + 2 files changed, 3 insertions(+) diff --git a/installer/roles/image_build/files/Dockerfile.sdist b/installer/roles/image_build/files/Dockerfile.sdist index f946c9168d..4c6d51f9b9 100644 --- a/installer/roles/image_build/files/Dockerfile.sdist +++ b/installer/roles/image_build/files/Dockerfile.sdist @@ -13,6 +13,8 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - RUN yum install -y nodejs RUN npm set progress=false +RUN ln -s /usr/bin/python36 /usr/bin/python3 + WORKDIR "/awx" ENTRYPOINT ["/bin/bash", "-c"] diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index 7517cae809..67a4a944b7 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -32,6 +32,7 @@ RUN yum -y install epel-release && \ yum -y localinstall https://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 python36-setuptools 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 && \