Fix MQ Developer scripts to allow centos image building

2018-06-20 13:18:49 +01:00
parent 5c176cce15
commit ea7105c82c
7 changed files with 128 additions and 23 deletions
--- a/incubating/mq-golang-sdk/Dockerfile
+++ b/incubating/mq-golang-sdk/Dockerfile
@@ -16,22 +16,18 @@ ARG BASE_IMAGE=mq-sdk:9.0.5.0-x86_64-ubuntu-16.04

 FROM $BASE_IMAGE

+COPY incubating/mq-golang-sdk/install-golang.sh /usr/local/bin
+
 ENV GO_VERSION=1.10

-# Install the Go compiler and Git
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && bash -c 'source /etc/os-release; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME} main restricted" > /etc/apt/sources.list; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main restricted" >> /etc/apt/sources.list; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-backports main restricted universe" >> /etc/apt/sources.list;' \
-  && apt-get update \
-  && 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:/go/bin" \
-    CGO_CFLAGS="-I/opt/mqm/inc/"                         \
-    CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"                     \
+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"

-RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
+# Install the Go compiler and Git
+RUN chmod +x /usr/local/bin/install-golang.sh \
+    && sleep 1 \
+    && install-golang.sh 
+
 WORKDIR $GOPATH
--- a/incubating/mq-golang-sdk/install-golang.sh
+++ b/incubating/mq-golang-sdk/install-golang.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+# -*- mode: sh -*-
+# © Copyright IBM Corporation 2018
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Fail on any non-zero return code
+set -ex
+
+test -f /usr/bin/yum && RHEL=true || RHEL=false
+test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false
+
+if ($UBUNTU); then
+  export DEBIAN_FRONTEND=noninteractive
+  # Use a reduced set of apt repositories.
+  # This ensures no unsupported code gets installed, and makes the build faster
+  source /etc/os-release
+  # Figure out the correct apt URL based on the CPU architecture
+  CPU_ARCH=$(uname -p)
+  if [ ${CPU_ARCH} == "x86_64" ]; then
+     APT_URL="http://archive.ubuntu.com/ubuntu/"
+  else
+     APT_URL="http://ports.ubuntu.com/ubuntu-ports/"
+  fi
+  # Use a reduced set of apt repositories.
+  # This ensures no unsupported code gets installed, and makes the build faster
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME} main restricted" > /etc/apt/sources.list
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME}-updates main restricted" >> /etc/apt/sources.list
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME}-backports main restricted universe" >> /etc/apt/sources.list;
+  echo "deb ${APT_URL} ${UBUNTU_CODENAME}-security main restricted" >> /etc/apt/sources.list
+  
+  apt-get update 
+  apt-get install -y --no-install-recommends \
+    golang-${GO_VERSION} \
+    git \
+    ca-certificates
+fi
+
+if ($RHEL); then
+  # Install additional packages required by MQ, this install process and the runtime scripts
+  yum -y install \
+    git \
+    curl \
+    tar \
+    gcc
+
+    cd /tmp
+    curl -LO https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz
+    tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
+fi
+
+# Remove any orphaned packages
+$UBUNTU && apt-get autoremove -y
+
+# Clean up cached files
+$UBUNTU && rm -rf /var/lib/apt/lists/*
+$RHEL && yum -y clean all
+$RHEL && rm -rf /var/cache/yum/*
+
+# Make the GOLANG directories 
+mkdir -p $GOPATH/src $GOPATH/bin
+chmod -R 777 $GOPATH
--- a/incubating/mq-sdk/Dockerfile
+++ b/incubating/mq-sdk/Dockerfile
@@ -12,14 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM ubuntu:16.04
+ARG BASE_IMAGE=ubuntu:16.04
+
+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
 ARG MQ_URL

 # The packages to install in install-mq.sh
-ENV MQ_PACKAGES="ibmmq-sdk ibmmq-samples build-essential"
+ARG MQ_PACKAGES

 COPY install-mq.sh /usr/local/bin/

--- a/incubating/mqadvanced-server-dev/Dockerfile
+++ b/incubating/mqadvanced-server-dev/Dockerfile
@@ -12,10 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+ARG BASE_IMAGE=mqadvanced-server-dev-base:9.0.5.0-x86_64-ubuntu-16.04
+ARG BUILDER_IMAGE=mq-golang-sdk:9.0.5.0-x86_64-ubuntu-16.04
+
 ###############################################################################
 # Build stage to build Go code
 ###############################################################################
-FROM mq-golang-sdk:9.0.5.0-x86_64-ubuntu-16.04 as builder
+FROM $BUILDER_IMAGE as builder
 WORKDIR /go/src/github.com/ibm-messaging/mq-container/
 COPY cmd/ ./cmd
 COPY internal/ ./internal
@@ -29,7 +32,7 @@ RUN go test -v ./cmd/runmqdevserver/...
 ###############################################################################
 # Main build stage
 ###############################################################################
-FROM mqadvanced-server-dev-base:9.0.5.0-x86_64-ubuntu-16.04
+FROM $BASE_IMAGE

 # Enable MQ developer default configuration
 ENV MQ_DEV=true