From c39a532da9d2fa99e5a0f37516a498a8a05961df Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Tue, 17 Nov 2020 14:18:22 +0000 Subject: [PATCH] Use Red Hat registry for all images in build --- Dockerfile-server | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-server b/Dockerfile-server index 8195907..57bb216 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -14,12 +14,12 @@ ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal ARG BASE_TAG=8.3-201 -ARG GO_WORKDIR=/go/src/github.com/ibm-messaging/mq-container +ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.0.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" ############################################################################### # Build stage to build Go code ############################################################################### -FROM golang:1.14.9 as builder +FROM registry.redhat.io/ubi8/go-toolset:1.14.7-15 as builder # The URL to download the MQ installer from in tar.gz format # This assumes an archive containing the MQ Non-Install packages ARG MQ_URL diff --git a/Makefile b/Makefile index 6ba58ed..aa3ced7 100644 --- a/Makefile +++ b/Makefile @@ -277,8 +277,8 @@ test-advancedserver-cover: test/docker/vendor coverage # Build an MQ image. The commands used are slightly different between Docker and Podman define build-mq $(if $(findstring docker,$(COMMAND)), @docker network create build,) - $(if $(findstring docker,$(COMMAND)), @docker run --rm --name $(BUILD_SERVER_CONTAINER) --network build --network-alias build --volume $(DOWNLOADS_DIR):/usr/share/nginx/html:ro --detach docker.io/nginx:alpine,) - $(eval EXTRA_ARGS=$(if $(findstring docker,$(COMMAND)), --network build --build-arg MQ_URL=http://build:80/$4, --volume $(DOWNLOADS_DIR):/var/downloads --build-arg MQ_URL=file:///var/downloads/$4)) + $(if $(findstring docker,$(COMMAND)), @docker run --rm --name $(BUILD_SERVER_CONTAINER) --network build --network-alias build --volume $(DOWNLOADS_DIR):/opt/app-root/src:ro --detach registry.redhat.io/ubi8/nginx-118 nginx -g "daemon off;",) + $(eval EXTRA_ARGS=$(if $(findstring docker,$(COMMAND)), --network build --build-arg MQ_URL=http://build:8080/$4, --volume $(DOWNLOADS_DIR):/var/downloads --build-arg MQ_URL=file:///var/downloads/$4)) # Build the new image $(COMMAND) build \ --tag $1:$2 \