From adad573f99b89c2112358a7aee6299e9fb3dd4b5 Mon Sep 17 00:00:00 2001 From: Rob Parker Date: Wed, 16 May 2018 09:44:28 +0100 Subject: [PATCH 1/2] correctly configure the GO environment --- incubating/mq-golang-sdk/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/incubating/mq-golang-sdk/Dockerfile b/incubating/mq-golang-sdk/Dockerfile index 03971999..35b4d02e 100644 --- a/incubating/mq-golang-sdk/Dockerfile +++ b/incubating/mq-golang-sdk/Dockerfile @@ -28,6 +28,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get install -y --no-install-recommends golang-${GO_VERSION} git ca-certificates \ && rm -rf /var/lib/apt/lists/* -ENV PATH="${PATH}:/usr/lib/go-${GO_VERSION}/bin" -ENV CGO_CFLAGS="-I/opt/mqm/inc/" -ENV CGO_LDFLAGS_ALLOW="-Wl,-rpath.*" \ No newline at end of file +ENV PATH="${PATH}:/usr/lib/go-${GO_VERSION}/bin:/go/bin" \ + CGO_CFLAGS="-I/opt/mqm/inc/" \ + CGO_LDFLAGS_ALLOW="-Wl,-rpath.*" \ + GOPATH="/go" + +RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" +WORKDIR $GOPATH From 9b595a0e010962352f32f0d021d2e5ef595762f2 Mon Sep 17 00:00:00 2001 From: Rob Parker Date: Wed, 16 May 2018 13:41:18 +0100 Subject: [PATCH 2/2] Check err when calling ImageInspectWithRaw --- test/docker/docker_api_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/docker/docker_api_test.go b/test/docker/docker_api_test.go index cf5406f2..2010fb8c 100644 --- a/test/docker/docker_api_test.go +++ b/test/docker/docker_api_test.go @@ -211,6 +211,9 @@ func TestCreateQueueManagerFail(t *testing.T) { t.Fatal(err) } img, _, err := cli.ImageInspectWithRaw(context.Background(), imageName()) + if err != nil { + t.Fatal(err) + } oldEntrypoint := strings.Join(img.Config.Entrypoint, " ") containerConfig := container.Config{ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1"}, @@ -235,6 +238,9 @@ func TestStartQueueManagerFail(t *testing.T) { t.Fatal(err) } img, _, err := cli.ImageInspectWithRaw(context.Background(), imageName()) + if err != nil { + t.Fatal(err) + } oldEntrypoint := strings.Join(img.Config.Entrypoint, " ") containerConfig := container.Config{ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1", "DEBUG=1"},