diff --git a/.travis.yml b/.travis.yml index 911e7ab..6f2a25a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required language: go go: - - 1.9 + - 1.10 services: - docker diff --git a/Dockerfile-server b/Dockerfile-server index d168304..f1f51c7 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -17,7 +17,7 @@ ARG BASE_IMAGE=ubuntu:16.04 ############################################################################### # Build stage to build Go code ############################################################################### -FROM golang:1.9 as builder +FROM golang:1.10 as builder WORKDIR /go/src/github.com/ibm-messaging/mq-container/ COPY cmd/ ./cmd COPY internal/ ./internal @@ -34,7 +34,7 @@ RUN go test -v ./internal/... ############################################################################### # Main build stage, to build MQ image ############################################################################### -FROM $BASE_IMAGE +FROM $BASE_IMAGE # The URL to download the MQ installer from in tar.gz format # This assumes an archive containing the MQ Debian (.deb) install packages diff --git a/Dockerfile-server.cover b/Dockerfile-server.cover index 0122224..1d7f1e2 100644 --- a/Dockerfile-server.cover +++ b/Dockerfile-server.cover @@ -1,4 +1,4 @@ -# © Copyright IBM Corporation 2017 +# © Copyright IBM Corporation 2017, 2018 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ ARG BASE_IMAGE # Build stage to build Go code -FROM golang:1.9 as builder +FROM golang:1.10 as builder WORKDIR /go/src/github.com/ibm-messaging/mq-container/ COPY cmd/ ./cmd COPY internal/ ./internal diff --git a/incubating/mqadvanced-server-dev/Dockerfile b/incubating/mqadvanced-server-dev/Dockerfile index a73cc03..9b12b60 100644 --- a/incubating/mqadvanced-server-dev/Dockerfile +++ b/incubating/mqadvanced-server-dev/Dockerfile @@ -15,7 +15,7 @@ ############################################################################### # Build stage to build Go code ############################################################################### -FROM golang:1.9 as builder +FROM golang:1.10 as builder WORKDIR /go/src/github.com/ibm-messaging/mq-container/ COPY cmd/ ./cmd COPY internal/ ./internal @@ -59,4 +59,4 @@ RUN chmod +x /usr/local/bin/runmq* EXPOSE 9443 -ENTRYPOINT ["runmqdevserver"] \ No newline at end of file +ENTRYPOINT ["runmqdevserver"]