From 97472cb91b1f8ed56c37e93438519d4c8aaef206 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 15 Jan 2018 15:39:48 -0500 Subject: [PATCH] Fix sdist builder image Fallout from https://github.com/ansible/awx/pull/982 --- installer/image_build/files/Dockerfile.sdist | 3 ++- installer/image_build/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/installer/image_build/files/Dockerfile.sdist b/installer/image_build/files/Dockerfile.sdist index 15d0749f15..cf9845e540 100644 --- a/installer/image_build/files/Dockerfile.sdist +++ b/installer/image_build/files/Dockerfile.sdist @@ -1,11 +1,12 @@ FROM centos:7 RUN yum install -y epel-release +RUN yum install -y https://centos7.iuscommunity.org/ius-release.rpm RUN yum install -y bzip2 \ gcc-c++ \ gettext \ - git \ + git2u-core \ make \ python \ python-pip diff --git a/installer/image_build/tasks/main.yml b/installer/image_build/tasks/main.yml index 3b7724a475..d3dd66207f 100644 --- a/installer/image_build/tasks/main.yml +++ b/installer/image_build/tasks/main.yml @@ -1,6 +1,6 @@ --- - 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 register: awx_version_command when: awx_version is not defined