From 9fb724229d650b78f38c2b7a2378300dd532349c Mon Sep 17 00:00:00 2001 From: Nassim Kammah Date: Fri, 20 Mar 2020 14:26:29 +0100 Subject: [PATCH] Update BASE_REGISTRY, yum commands and Jenkinsfile --- Dockerfile | 8 ++++---- Jenkinsfile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb84f36..8072cd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,13 @@ # Build stage 0 # Extract Kibana and make various file manipulations. ################################################################################ -ARG BASE_REGISTRY=registry.access.redhat.com -ARG BASE_IMAGE=ubi8/ubi +ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 +ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.1 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS prep_files -RUN yum -y --nogpgcheck --disableplugin=subscription-manager update && yum install -y --nogpgcheck --disableplugin=subscription-manager tar gzip && yum clean all +RUN yum update --disablerepo="*" --enablerepo="*ubi-8*" --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" tar gzip && yum clean all RUN mkdir /usr/share/kibana WORKDIR /usr/share/kibana @@ -36,7 +36,7 @@ EXPOSE 5601 COPY LICENSE /licenses/elastic-kibana # Add Reporting dependencies. -RUN yum -y --nogpgcheck --disableplugin=subscription-manager update && yum install -y --nogpgcheck --disableplugin=subscription-manager fontconfig freetype shadow-utils && yum clean all +RUN yum update --disablerepo="*" --enablerepo="*ubi-8*" --setopt=tsflags=nodocs -y && yum install -y --disablerepo="*" --enablerepo="*ubi-8*" fontconfig freetype shadow-utils && yum clean all # Add a dumb init process WORKDIR /usr/local/bin diff --git a/Jenkinsfile b/Jenkinsfile index 98a8b67..d71bca6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ -@Library('DCCSCR@master') -dccscrPipeline(version: "7.6.1") +@Library('DCCSCR@master') _ +dccscrPipeline(version: '7.6.1') -- GitLab