mirror of
https://github.com/ansible/awx.git
synced 2024-10-30 22:21:13 +03:00
Revert "first-parent requires git >= 1.8.4"
This reverts commit 1af0ee2f8c
.
# Conflicts:
# installer/roles/image_build/templates/Dockerfile.j2
This commit is contained in:
parent
86140dec08
commit
3701567ad7
@ -29,10 +29,9 @@ WORKDIR /tmp
|
||||
RUN mkdir -p /var/lib/awx/public/static
|
||||
RUN chgrp -Rf root /var/lib/awx && chmod -Rf g+w /var/lib/awx
|
||||
RUN yum -y install epel-release && \
|
||||
yum -y install https://centos7.iuscommunity.org/ius-release.rpm && \
|
||||
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 git2u-core 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 krb5-workstation krb5-libs python-crypto libcurl-devel rsync unzip && \
|
||||
pip install virtualenv supervisor && \
|
||||
CFLAGS="-DXMLSEC_NO_SIZE_T" \
|
||||
VENV_BASE=/var/lib/awx/venv make requirements_ansible && \
|
||||
|
Loading…
Reference in New Issue
Block a user