Fixes to build MQExplorer.

.travis.yml

@@ -25,7 +25,7 @@ services:
 
 env:
   global:
-    - MAIN_BRANCH=private-master
+    - MAIN_BRANCH=v9.2.1
     - MQ_LTS_VERSION=9.2.0.1
     - TAGCACHE_FILE=tagcache
     - RELEASE=r1
@@ -40,7 +40,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.1 AND tag IS blank
       name: "Basic AMD64 build"
       os: linux
       env:
@@ -50,20 +50,20 @@ jobs:
     # CD Build
 
     - stage: global-tag
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 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.1 OR tag =~ ^release-candidate*
       name: "Multi-Arch AMD64 build"
       os: linux
       env:
         - BUILD_ALL=true
         - MQ_ARCHIVE_REPOSITORY=$MQ_921_ARCHIVE_REPOSITORY_AMD64
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_AMD64
       script: bash -e travis-build-scripts/run.sh
-    # - if: branch = private-master OR tag =~ ^release-candidate*
+    # - if: branch = v9.2.1 OR tag =~ ^release-candidate*
     #   name: "Multi-Arch PPC64LE build"
     #   os: linux-ppc64le
     #   env:
@@ -73,7 +73,7 @@ jobs:
     #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_PPC64LE
     #   script: bash -e travis-build-scripts/run.sh
     - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 OR tag =~ ^release-candidate*
       name: "Multi-Arch S390X build"
       os: linux-s390
       env:
@@ -83,7 +83,7 @@ jobs:
         - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_S390X
       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.1 AND type != pull_request OR tag =~ ^release-candidate*
       name: "Push Manifest-list to registry"
       env:
         - PUSH_MANIFEST_ONLY=true
@@ -92,7 +92,7 @@ jobs:
       # LTS Build
 
     - stage: global-tag
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 AND type != pull_request OR tag =~ ^release-candidate*
       name: "Generate Global Tag"
       os: linux
       env:
@@ -102,7 +102,7 @@ jobs:
         - RELEASE=$RELEASE_LTS
       script: bash -e travis-build-scripts/global-tag.sh
     - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 OR tag =~ ^release-candidate*
       name: "Multi-Arch AMD64 build"
       os: linux
       env:
@@ -113,7 +113,7 @@ jobs:
         - RELEASE=$RELEASE_LTS
       script: bash -e travis-build-scripts/run.sh
     - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 OR tag =~ ^release-candidate*
       name: "Multi-Arch S390X build"
       os: linux-s390
       env:
@@ -125,7 +125,7 @@ jobs:
         - 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*
+      if: branch = v9.2.1 AND type != pull_request OR tag =~ ^release-candidate*
       name: "Push Manifest-list to registry"
       env:
         - LTS=true

Dockerfile-server

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
 ARG BASE_TAG=8.3-230
 ARG GO_WORKDIR=/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.1.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"

incubating/mq-explorer/Dockerfile

@@ -12,33 +12,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM registry.redhat.io/ubi8/ubi-minimal AS mq-explorer
+FROM registry.access.redhat.com/ubi8/ubi-minimal AS mq-explorer
 
 # The URL to download the MQ installer from in tar.gz format
-ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev912_linux_x86-64.tar.gz"
+ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev920_linux_x86-64.tar.gz"
 
 # The MQ packages to install
 ENV MQ_PACKAGES="MQSeriesRuntime*.rpm MQSeriesJRE*.rpm MQSeriesExplorer*.rpm"
 
 ARG MQM_UID=888
 
-RUN microdnf install -y gtk2 libXtst \
+RUN microdnf install -y gtk2 libXtst tar gzip \
   && microdnf clean all
 
 ADD install-mq.sh /usr/local/bin/
 
 # Install MQ Explorer.  To avoid a "text file busy" error here, we sleep before installing.
-# Need to re-instate the `/var/mqm` directory after installation, to avoid MQ 
+# Need to re-instate the `/var/mqm` directory after installation, to avoid MQ
 # errors with some commands (e.g. `dspmqver`)
-RUN chmod u+x /usr/local/bin/install-mq.sh \
-  && sleep 1 \
-  && install-mq.sh $MQM_UID \
-  && rm -rf /var/mqm \
-  && /opt/mqm/bin/crtmqdir -f -s
+# RUN chmod u+x /usr/local/bin/install-mq.sh \
+#   && sleep 1 \
+#   && install-mq.sh $MQM_UID \
+#   && rm -rf /var/mqm \
+#   && /opt/mqm/bin/crtmqdir -f -s
+
+RUN curl -LO $MQ_URL
+RUN tar -xzvf *.tar.gz
 
 ENV LANG=en_US.UTF-8
 
+RUN microdnf install shadow-utils findutils
+
+RUN rpm -ivh MQServer/MQSeriesRuntime-9.2.0-0.x86_64.rpm
+RUN MQServer/mqlicense.sh -accept
+
+RUN rpm -ivh MQServer/MQSeriesJRE-9.2.0-0.x86_64.rpm
+RUN rpm -ivh MQServer/MQSeriesExplorer-9.2.0-0.x86_64.rpm
+
 # Run as mqm
-USER $MQM_UID
+# USER $MQM_UID
+
+ENV PATH=$PATH:/opt/mqm/bin/
+
+RUN microdnf install curl
 
-ENTRYPOINT ["MQExplorer"]
+RUN microdnf install less gtk3
+RUN microdnf install libglvnd-glx
+ENTRYPOINT ["MQExplorer"]