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

* upgrade from git on containers

Browse Source 
* agreed with terms of DCO 1.1

Signed-off-by: Jorge Machado <jorge@jmachado.me>
This commit is contained in:
Jorge Machado
2019-07-22 21:14:39 +02:00
parent f6c357659d
commit 76933ed889
4 changed files with 12 additions and 8 deletions
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 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 \ RUN yum install -y \
bzip2 \ bzip2 \
gcc-c++ \ gcc-c++ \
git \ git2u \
git2u-core \
make \ make \
nodejs \ nodejs \
npm npm

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

@@ -1,11 +1,12 @@
FROM centos:7 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 \ RUN yum install -y bzip2 \
gcc-c++ \ gcc-c++ \
gettext \ gettext \
git \ git2u \
git2u-core \
make \ make \
nodejs \ nodejs \
python36-setuptools 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 ansible.repo /etc/yum.repos.d/ansible.repo
ADD RPM-GPG-KEY-ansible-release /etc/pki/rpm-gpg/RPM-GPG-KEY-ansible-release 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 # sync with tools/docker-compose/Dockerfile
RUN yum -y install acl \ RUN yum -y install acl \
@@ -16,7 +16,8 @@ RUN yum -y install acl \
cyrus-sasl-devel \ cyrus-sasl-devel \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
git \ git2u \
git2u-core \
krb5-devel \ krb5-devel \
krb5-libs \ krb5-libs \
krb5-workstation \ krb5-workstation \

5
tools/docker-compose/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM centos:7
ARG UID=0 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 # sync with installer/roles/image_build/templates/Dockerfile.j2
RUN yum -y install acl \ RUN yum -y install acl \
@@ -17,7 +17,8 @@ RUN yum -y install acl \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
GConf2 \ GConf2 \
git \ git2u \
git2u-core \
gtk3 \ gtk3 \
ipa-gothic-fonts \ ipa-gothic-fonts \
krb5-devel \ krb5-devel \