From 1822c45c795e60a455beb18de641c7ef77f640a2 Mon Sep 17 00:00:00 2001 From: David Bell Date: Wed, 19 May 2021 14:59:04 +0100 Subject: [PATCH] update ubi and go --- Dockerfile-server | 6 +++--- go.mod | 2 +- test/docker/go.mod | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile-server b/Dockerfile-server index 6e79d24..4b8d8f0 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -13,13 +13,13 @@ # limitations under the License. ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal -ARG BASE_TAG=8.3-298.1618432845 -ARG GO_WORKDIR=/go/src/github.com/ibm-messaging/mq-container +ARG BASE_TAG=8.4-200 +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 docker.io/golang:1.14.15 as builder +FROM registry.redhat.io/ubi8/go-toolset:1.15.7-11 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/go.mod b/go.mod index ae88d8f..352140c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ibm-messaging/mq-container -go 1.14 +go 1.15 require ( github.com/genuinetools/amicontained v0.4.0 diff --git a/test/docker/go.mod b/test/docker/go.mod index 29c48f7..d0ff700 100644 --- a/test/docker/go.mod +++ b/test/docker/go.mod @@ -1,6 +1,6 @@ module github.com/ibm-messaging/mq-container/test/docker -go 1.14 +go 1.15 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect