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

Merge pull request #6585 from shanemcd/cleanup-cleanup

Browse Source 
Tidy up the dev environment a bit
This commit is contained in:
Shane McDonald
2020-04-06 13:09:39 -04:00
committed by GitHub
parent a46462eede 6fc815937b
commit bb319136e4
5 changed files with 186 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +1,17 @@
FROM centos:7
FROM centos:8
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 dnf -y update && dnf -y install epel-release && \
dnf install -y bzip2 \
gcc-c++ \
gettext \
git2u \
git2u-core \
git \
make \
nodejs \
python36-setuptools
python3 \
python3-setuptools
# Use the distro provided npm to bootstrap our required version of node
RUN npm install -g n
RUN n 10.15.0
RUN yum remove -y nodejs
RUN npm install -g n && n 10.15.0 && dnf remove -y nodejs
ENV PATH=/usr/local/n/versions/node/10.15.0/bin:$PATH

3
installer/roles/image_build/files/google-cloud-sdk.repo
View File

@@ -3,6 +3,5 @@ name=Google Cloud SDK
baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el8-x86_64
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg