From b1bfae6db83ff7ff6aec1e6874c652648889e665 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 10 May 2019 20:49:32 +0200 Subject: [PATCH] fas: combine various build layers Signed-off-by: Patrick Uiterwijk --- roles/openshift-apps/fas/templates/buildconfig-fas.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/openshift-apps/fas/templates/buildconfig-fas.yml b/roles/openshift-apps/fas/templates/buildconfig-fas.yml index 31c5ad5428..ae31edab3c 100644 --- a/roles/openshift-apps/fas/templates/buildconfig-fas.yml +++ b/roles/openshift-apps/fas/templates/buildconfig-fas.yml @@ -9,12 +9,13 @@ spec: source: dockerfile: |- FROM registry.access.redhat.com/rhel6 - RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo - RUN curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo - RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo + RUN curl -o /etc/yum.repos.d/rhel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel6.repo && \ + curl -o /etc/yum.repos.d/epel6.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/epel6.repo {% if env == "staging" %} - RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo + RUN curl -o /etc/yum.repos.d/infra-tags-stg.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags-stg.repo && \ {% endif %} + RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/rhel-infra-tags.repo + RUN yum install -y \ fas \ fas-plugin-yubikey \