From 463074795f3e7823eafe0474dc101947b14a3c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Mon, 4 Mar 2019 14:16:17 +0100 Subject: [PATCH] fix dockerfile for usage with Docker Build services --- support/openshift/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/support/openshift/Dockerfile b/support/openshift/Dockerfile index 189a9ae..881b932 100644 --- a/support/openshift/Dockerfile +++ b/support/openshift/Dockerfile @@ -7,7 +7,10 @@ LABEL io.k8s.display-name="OpenShift Custom builder for Ansible role nmasse-itix io.openshift.tags="builder,3scale" ARG THREESCALE_CICD_GIT_REPOSITORY=https://github.com/nmasse-itix/threescale-cicd.git -ARG THREESCALE_CICD_GIT_BRANCH=master + +# This one is by convention used by the Docker Build services. +# See https://docs.docker.com/docker-hub/builds/advanced/ +ARG SOURCE_BRANCH=master RUN yum install -y centos-release-scl && \ yum-config-manager --enable rhel-server-rhscl-7-rpms && \ @@ -16,7 +19,7 @@ RUN yum install -y centos-release-scl && \ yum clean all && \ rm -rf /var/cache/yum && \ mkdir -p /opt/ansible/threescale-cicd && \ - git clone -b ${THREESCALE_CICD_GIT_BRANCH} -- ${THREESCALE_CICD_GIT_REPOSITORY} /opt/ansible/threescale-cicd && \ + git clone -b ${SOURCE_BRANCH} -- ${THREESCALE_CICD_GIT_REPOSITORY} /opt/ansible/threescale-cicd && \ cd /opt/ansible/threescale-cicd/support/openshift && mkdir api && \ ansible-playbook install.yaml