Skip to content

Commit 1f6d37a

Browse files
mirskifaGitHub Enterprise
authored andcommitted
Merge pull request #190 from mq-cloudpak/amf-update-go-924
Update go, go-toolset, and UBI
2 parents 1a88555 + 5f706e0 commit 1f6d37a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ sudo: required
1818
language: go
1919

2020
go:
21-
- "1.15.14"
21+
- "1.16.7"
2222

2323
services:
2424
- docker

Dockerfile-server

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
16-
ARG BASE_TAG=8.4-212
16+
ARG BASE_TAG=8.5-204
1717
ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset
18-
ARG BUILDER_TAG=1.15.14-18
18+
ARG BUILDER_TAG=1.16.7-5
1919
ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
2020
ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.4.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
2121
###############################################################################
@@ -37,6 +37,7 @@ RUN mkdir /opt/mqm \
3737
&& INSTALL_SDK=1 install-mq.sh \
3838
&& chown -R 1001:root /opt/mqm/*
3939
WORKDIR $GO_WORKDIR/
40+
COPY go.mod go.sum ./
4041
COPY cmd/ ./cmd
4142
COPY internal/ ./internal
4243
COPY pkg/ ./pkg

install-build-deps.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ set -ex
2222
sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-$ARCH
2323
sudo chmod +x /usr/local/bin/dep
2424

25-
go get -u golang.org/x/lint/golint
25+
go install golang.org/x/lint/golint@latest
2626
curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin 2.0.0 || echo "Gosec not installed. Platform may not be supported."

0 commit comments

Comments
 (0)