From f2a9d7559550d1ba4286b9223fd8c7e1c2e1a86e Mon Sep 17 00:00:00 2001 From: Alex Mirski-Fitton Date: Thu, 7 Jul 2022 13:44:56 +0100 Subject: [PATCH] Update to Go 1.17 Also pick up latest UBI base image --- .travis.yml | 2 +- CHANGELOG.md | 1 + Dockerfile-server | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8edc46c..fb2f055 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ sudo: required language: go go: - - "1.16.12" + - "1.17.10" services: - docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 5da6cc5..758f38a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 9.2.0.6-LTS (2022-07-20) * Updated to MQ version 9.2.0.6 +* Updated to Go version 1.17 ## 9.2.0.5-LTS (2022-01-25) diff --git a/Dockerfile-server b/Dockerfile-server index c7ac393..4c764ac 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -1,4 +1,4 @@ -# © Copyright IBM Corporation 2015, 2020 +# © Copyright IBM Corporation 2015, 2022 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,9 +13,9 @@ # limitations under the License. ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal -ARG BASE_TAG=8.6-751.1655117800 +ARG BASE_TAG=8.6-854 ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset -ARG BUILDER_TAG=1.16.12-10 +ARG BUILDER_TAG=1.17.10-4 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.6-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" ############################################################################### @@ -56,7 +56,8 @@ RUN go test -v ./cmd/chkmqready/ RUN go test -v ./cmd/chkmqhealthy/ RUN go test -v ./pkg/... RUN go test -v ./internal/... -RUN go vet ./cmd/... ./internal/... +# go 1.17 sigchanyzer check disabled for EUS stream as fix would introduce change of behaviour +RUN go vet -sigchanyzer=FALSE ./cmd/... ./internal/... ############################################################################### # Main build stage, to build MQ image