External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4363 from jomach/feature/updateGitVersion

Browse Source 
[4362] git version is old and does not work with x509 certificates

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-07-30 21:07:24 +00:00 committed by GitHub
commit 815823adc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/test/e2e/cluster/Dockerfile
View File

@ -1,11 +1,12 @@
FROM centos:7
RUN yum install -y epel-release
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
RUN yum install -y \
bzip2 \
gcc-c++ \
git \
git2u \
git2u-core \
make \
nodejs \
npm

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

@ -1,11 +1,12 @@
FROM centos:7
RUN yum install -y epel-release
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
RUN yum install -y bzip2 \
gcc-c++ \
gettext \
git \
git2u \
git2u-core \
make \
nodejs \
python36-setuptools

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

@ -5,7 +5,7 @@ USER root
ADD ansible.repo /etc/yum.repos.d/ansible.repo
ADD RPM-GPG-KEY-ansible-release /etc/pki/rpm-gpg/RPM-GPG-KEY-ansible-release
RUN yum -y update && yum -y install epel-release
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
# sync with tools/docker-compose/Dockerfile
RUN yum -y install acl \
@ -16,7 +16,8 @@ RUN yum -y install acl \
cyrus-sasl-devel \
gcc \
gcc-c++ \
git \
git2u \
git2u-core \
krb5-devel \
krb5-libs \
krb5-workstation \

5
tools/docker-compose/Dockerfile
View File

@ -2,7 +2,7 @@ FROM centos:7
ARG UID=0
RUN yum -y update && yum -y install epel-release
RUN yum -y update && yum -y install epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
# sync with installer/roles/image_build/templates/Dockerfile.j2
RUN yum -y install acl \
@ -17,7 +17,8 @@ RUN yum -y install acl \
gcc \
gcc-c++ \
GConf2 \
git \
git2u \
git2u-core \
gtk3 \
ipa-gothic-fonts \
krb5-devel \