External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 18:18:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removes failing symlink to /usr/bin/python3 during the image build

Browse Source 
Installing the latest python36-setuptools automatically creates the symlink from python3 -> python3.6 and from python36 -> /usr/bin/python3.6. Building the images fails when the symlink is created explicitly in the AWX installer.

Signed-off-by: Uriel Mandujano <uriel.mandujano14@gmail.com>
This commit is contained in:
Uriel Mandujano
2019-04-06 11:13:41 -05:00
parent 97e030dd1f
commit 4821a94944
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/image_build/files/Dockerfile.sdist
View File

@@ -13,8 +13,6 @@ 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"]

1
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -32,7 +32,6 @@ 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 && \