Merge pull request #247 from mq-cloudpak/tadj-update-ubi

udpdate ubi

.travis.yml

@@ -25,11 +25,9 @@ services:
 
 env:
   global:
-    - MAIN_BRANCH=private-master
+    - MAIN_BRANCH=v9.2.5
-    - MQ_LTS_VERSION=9.2.0.4
     - TAGCACHE_FILE=tagcache
-    - RELEASE=r1
+    - RELEASE=r3
-    - RELEASE_LTS=r1
 
 go_import_path: "github.com/ibm-messaging/mq-container"
 
@@ -40,7 +38,7 @@ go_import_path: "github.com/ibm-messaging/mq-container"
 jobs:
   include:
     - stage: basic-build
-      if: branch != private-master AND tag IS blank
+      if: branch != v9.2.5 AND tag IS blank
       name: "Basic AMD64 build"
       os: linux
       env:
@@ -50,12 +48,12 @@ jobs:
     # CD Build
 
     - stage: global-tag
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
+      if: branch = v9.2.5 AND type != pull_request OR tag =~ ^release-candidate*
       name: "Generate Global Tag"
       os: linux
       script: bash -e travis-build-scripts/global-tag.sh
     - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.5 OR tag =~ ^release-candidate*
       name: "Multi-Arch AMD64 build"
       os: linux
       env:
@@ -64,7 +62,7 @@ jobs:
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_925_ARCHIVE_REPOSITORY_DEV_AMD64
       script: bash -e travis-build-scripts/run.sh
     - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.5 OR tag =~ ^release-candidate*
       name: "Multi-Arch S390X build"
       os: linux-s390
       env:
@@ -74,7 +72,7 @@ jobs:
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_925_ARCHIVE_REPOSITORY_DEV_S390X
       script: bash -e travis-build-scripts/run.sh
     - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.5 OR tag =~ ^release-candidate*
       name: "Multi-Arch PPC64LE build"
       os: linux-ppc64le
       env:
@@ -84,69 +82,12 @@ jobs:
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_925_ARCHIVE_REPOSITORY_DEV_PPC64LE
       script: bash -e travis-build-scripts/run.sh
     - stage: push-manifest
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
+      if: branch = v9.2.5 AND type != pull_request OR tag =~ ^release-candidate*
       name: "Push Manifest-list to registry"
       env:
         - PUSH_MANIFEST_ONLY=true
       script: bash -e travis-build-scripts/run.sh
 
-      # LTS Build
-
-    - stage: global-tag
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
-      name: "Generate Global Tag"
-      os: linux
-      env:
-        - LTS=true
-        - TAGCACHE_FILE=tagcache-lts
-        - MQ_VERSION=$MQ_LTS_VERSION
-        - RELEASE=$RELEASE_LTS
-      script: bash -e travis-build-scripts/global-tag.sh
-    - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
-      name: "Multi-Arch AMD64 build"
-      os: linux
-      env:
-        - LTS=true
-        - TAGCACHE_FILE=tagcache-lts
-        - MQ_VERSION=$MQ_LTS_VERSION
-        - MQ_ARCHIVE_REPOSITORY=$MQ_9204_EUS_ARCHIVE_REPOSITORY_AMD64
-        - RELEASE=$RELEASE_LTS
-      script: bash -e travis-build-scripts/run.sh
-    - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
-      name: "Multi-Arch S390X build"
-      os: linux-s390
-      env:
-        - LTS=true
-        - TAGCACHE_FILE=tagcache-lts
-        - MQ_VERSION=$MQ_LTS_VERSION
-        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-        - MQ_ARCHIVE_REPOSITORY=$MQ_9204_EUS_ARCHIVE_REPOSITORY_S390X
-        - RELEASE=$RELEASE_LTS
-      script: bash -e travis-build-scripts/run.sh
-    - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
-      name: "Multi-Arch PPC64LE build"
-      os: linux-ppc64le
-      env:
-        - LTS=true
-        - TAGCACHE_FILE=tagcache-lts
-        - MQ_VERSION=$MQ_LTS_VERSION
-        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-        - MQ_ARCHIVE_REPOSITORY=$MQ_9204_EUS_ARCHIVE_REPOSITORY_PPC64LE
-        - RELEASE=$RELEASE_LTS
-      script: bash -e travis-build-scripts/run.sh
-    - stage: push-manifest
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
-      name: "Push Manifest-list to registry"
-      env:
-        - LTS=true
-        - TAGCACHE_FILE=tagcache-lts
-        - MQ_VERSION=$MQ_LTS_VERSION
-        - PUSH_MANIFEST_ONLY=true
-        - RELEASE=$RELEASE_LTS
-      script: bash -e travis-build-scripts/run.sh
 
 before_install:
   - make install-build-deps

Dockerfile-server

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
-ARG BASE_TAG=8.5-240
+ARG BASE_TAG=8.6-751
 ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset
-ARG BUILDER_TAG=1.16.12-7
+ARG BUILDER_TAG=1.16.12-10
 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
 ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.5.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
 ###############################################################################