From 1af0ee2f8ce8ae1128f97f6898b376b0219038bb Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Thu, 18 Jan 2018 16:12:23 +0000 Subject: [PATCH] first-parent requires git >= 1.8.4 --- installer/image_build/templates/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/image_build/templates/Dockerfile.j2 b/installer/image_build/templates/Dockerfile.j2 index d69e2c9704..1688df7a30 100644 --- a/installer/image_build/templates/Dockerfile.j2 +++ b/installer/image_build/templates/Dockerfile.j2 @@ -28,9 +28,10 @@ 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 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 && \ + 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 && \ pip install virtualenv supervisor && \ VENV_BASE=/var/lib/awx/venv make requirements_ansible && \ VENV_BASE=/var/lib/awx/venv make requirements_awx && \