Don't use redist client for Go SDK because of P+Z support

Makefile-UBUNTU

@@ -266,11 +266,15 @@ else
 build-sdk-ex: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesSDK-*.rpm MQSeriesSamples*.rpm
 endif
 build-sdk-ex: docker-version docker-pull
+	$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_SDK)"$(END)))
 	$(call docker-build-mq,$(MQ_IMAGE_SDK),incubating/mq-sdk/Dockerfile,$(MQ_SDK_ARCHIVE),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers SDK (Non-Warranted)",$(MQ_VERSION))
 
 .PHONY: build-golang-sdk
-build-golang-sdk:
-	$(DOCKER) build -t $(MQ_IMAGE_GOLANG_SDK) -f incubating/mq-golang-sdk/Dockerfile .
+build-golang-sdk: docker-version build-sdk
+	$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_GOLANG_SDK)"$(END)))
+	@echo hello
+	$(DOCKER) build --build-arg BASE_IMAGE=$(MQ_IMAGE_SDK) -t $(MQ_IMAGE_GOLANG_SDK) -f incubating/mq-golang-sdk/Dockerfile .
+	@echo goodbye
 
 .PHONY: docker-pull
 docker-pull:

incubating/mq-golang-sdk/Dockerfile

@@ -12,10 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
  
-FROM golang:1.10
+ARG BASE_IMAGE=mq-sdk:9.1.1.0-x86_64-ubuntu-16.04
 
-# Install the MQ redistributable client (including header files) into the Go builder image
-RUN mkdir -p /opt/mqm \
-  && curl -L https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.1.1.0-IBM-MQC-Redist-LinuxX64.tar.gz | tar -xz -C /opt/mqm
-ENV CGO_CFLAGS="-I/opt/mqm/inc/" \
-    CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"
+FROM $BASE_IMAGE
+
+COPY incubating/mq-golang-sdk/install-golang.sh /usr/local/bin
+
+ENV GO_VERSION=1.10
+
+ENV PATH="${PATH}:/usr/lib/go-${GO_VERSION}/bin:/go/bin:/usr/local/go/bin" \
+    CGO_CFLAGS="-I/opt/mqm/inc/"                                           \
+    CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"                                       \
+    GOPATH="/go"
+
+# Install the Go compiler and Git
+RUN chmod +x /usr/local/bin/install-golang.sh \
+    && sleep 1 \
+    && install-golang.sh 
+
+WORKDIR $GOPATH