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

Merge pull request #987 from shanemcd/devel

Browse Source 
Fix sdist builder image
This commit is contained in:
Shane McDonald
2018-01-15 20:25:16 -05:00
committed by GitHub
parent 2b1d2b2976 97472cb91b
commit cad5c5e79a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
installer/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 install -y epel-release
RUN yum install -y 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-core \
make \ make \
python \ python \
python-pip python-pip

2
installer/image_build/tasks/main.yml
View File

@@ -1,6 +1,6 @@
--- ---
- name: Get Version from checkout if not provided - name: Get Version from checkout if not provided
shell: "git describe --long | sed 's/\\-g.*//' | sed 's/\\-/\\./'" shell: "git describe --long --first-parent | sed 's/\\-g.*//' | sed 's/\\-/\\./'"
delegate_to: localhost delegate_to: localhost
register: awx_version_command register: awx_version_command
when: awx_version is not defined when: awx_version is not defined