Skip to content

Commit f459b90

Browse files
committed
Update Dockerfile for newer Ubuntu level
1 parent e92eaea commit f459b90

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG BASE_IMAGE=ubuntu:18.10
15+
ARG BASE_IMAGE=ubuntu:19.04
1616
FROM $BASE_IMAGE
1717

1818
ARG GOPATH_ARG="/go"
1919

20-
ENV GOVERSION=1.10 \
20+
ENV GOVERSION=1.12 \
2121
GOPATH=$GOPATH_ARG \
22-
ORG="github.com/ibm-messaging" \
23-
REPO="mq-golang"
22+
ORG="github.com/ibm-messaging"
23+
2424

2525
# Install the Go compiler and Git
2626
RUN export DEBIAN_FRONTEND=noninteractive \
@@ -67,6 +67,7 @@ RUN chmod 777 $GOPATH/buildInDocker.sh
6767

6868
# Copy the rest of the source tree from this directory into the container
6969
# And make sure it's readable by the id that will run the compiles (not just root)
70+
ENV REPO="mq-golang"
7071
COPY . $GOPATH/src/$ORG/$REPO
7172
RUN chmod -R a+rx $GOPATH/src
7273

buildInDocker.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ echo "Running as " `id`
2727
# Build the libraries so they can be used by other programs
2828
cd $GOPATH/src
2929

30+
echo "Using compiler:"
31+
go version
32+
3033
for pkg in $ORG/$REPO/ibmmq $ORG/$REPO/mqmetric
3134
do
3235
lib=`basename $pkg`
@@ -47,3 +50,4 @@ done
4750

4851
echo "Building program: mqitest"
4952
go build -o bin/mqitest $srcdir/mqitest/mqitest.go
53+

0 commit comments

Comments
 (0)