diff --git a/Dockerfile-server b/Dockerfile-server index 5d96adf..6e5f1af 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -74,8 +74,11 @@ RUN chmod ug+x /usr/local/bin/runmqserver \ && chown mqm:root /run/termination-log \ && chmod 0660 /run/termination-log -# Always use port 1414 for MQ & 9157 for the metrics -EXPOSE 1414 9157 +# Always use port 1414 for MQ, 9157 for the metrics & 9443 for the web console +EXPOSE 1414 9157 9443 + +# Copy web XML files +COPY web /etc/mqm/web ENV LANG=en_US.UTF-8 AMQ_DIAGNOSTIC_MSG_SEVERITY=1 AMQ_ADDITIONAL_JSON_LOG=1 LOG_FORMAT=basic diff --git a/Makefile-RHEL b/Makefile-RHEL index 1a13dcc..f1f64de 100644 --- a/Makefile-RHEL +++ b/Makefile-RHEL @@ -40,7 +40,7 @@ MQ_IMAGE_SDK ?=mq-sdk:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) # MQ_IMAGE_GOLANG_SDK is the name and tag of the built MQ Advanced for Developers SDK image, plus Go tools MQ_IMAGE_GOLANG_SDK ?=mq-golang-sdk:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) # MQ_PACKAGES specifies the MQ packages to install. Defaults vary on base image. -MQ_PACKAGES ?= MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm +MQ_PACKAGES ?= MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm MQSeriesWeb-*.rpm ############################################################################### # Other variables @@ -166,7 +166,6 @@ build-advancedserver: check-prereqs downloads/$(MQ_ARCHIVE) build-go-programs .PHONY: build-devserver build-devserver: MQDEV=TRUE -build-devserver: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm MQSeriesWeb-*.rpm build-devserver: check-prereqs downloads/$(MQ_ARCHIVE_DEV) build-go-programs $(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER)"$(END))) sudo mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE_DEV)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_DEVSERVER_BASE)" "$(MQ_VERSION)" "$(MQDEV)" diff --git a/Makefile-UBUNTU b/Makefile-UBUNTU index 95f1c6a..c45203c 100644 --- a/Makefile-UBUNTU +++ b/Makefile-UBUNTU @@ -134,7 +134,7 @@ downloads/$(MQ_ARCHIVE_DEV): downloads/$(MQ_SDK_ARCHIVE): $(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced for Developers "$(MQ_VERSION)$(END))) mkdir -p downloads - cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/$(MQ_SDK_ARCHIVE) + cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/$(MQ_SDK_ARCHIVE) .PHONY: downloads downloads: downloads/$(MQ_ARCHIVE_DEV) downloads/$(MQ_SDK_ARCHIVE) @@ -236,12 +236,6 @@ build-advancedserver: downloads/$(MQ_ARCHIVE) docker-version build-golang-sdk-ex $(call docker-build-mq,$(MQ_IMAGE_ADVANCEDSERVER),Dockerfile-server,$(MQ_ARCHIVE),"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced",$(MQ_VERSION)) .PHONY: build-devserver -# Target-specific variable to add web server into devserver image -ifeq "$(findstring ubuntu,$(BASE_IMAGE))" "ubuntu" -build-devserver: MQ_PACKAGES=ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-msg-.* ibmmq-samples ibmmq-ams ibmmq-web -else -build-devserver: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm MQSeriesWeb-*.rpm -endif build-devserver: MQ_SDK_ARCHIVE=$(MQ_ARCHIVE_DEV) build-devserver: downloads/$(MQ_ARCHIVE_DEV) docker-version build-golang-sdk-ex $(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER_BASE)"$(END))) @@ -267,7 +261,7 @@ build-sdk: downloads/$(MQ_SDK_ARCHIVE) build-sdk-ex .PHONY: build-sdk-ex ifeq "$(findstring ubuntu,$(BASE_IMAGE))" "ubuntu" build-sdk-ex: MQ_PACKAGES=ibmmq-sdk ibmmq-samples build-essential -else +else build-sdk-ex: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesSDK-*.rpm MQSeriesSamples*.rpm endif build-sdk-ex: docker-version docker-pull diff --git a/cmd/runmqserver/post_init_dev.go b/cmd/runmqserver/post_init.go similarity index 98% rename from cmd/runmqserver/post_init_dev.go rename to cmd/runmqserver/post_init.go index 861c566..59d6157 100644 --- a/cmd/runmqserver/post_init_dev.go +++ b/cmd/runmqserver/post_init.go @@ -1,5 +1,3 @@ -// +build mqdev - /* © Copyright IBM Corporation 2018 diff --git a/cmd/runmqserver/post_init_other.go b/cmd/runmqserver/post_init_other.go deleted file mode 100644 index 71f3458..0000000 --- a/cmd/runmqserver/post_init_other.go +++ /dev/null @@ -1,22 +0,0 @@ -// +build !mqdev - -/* -© 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. -*/ -package main - -func postInit(name string) error { - return nil -} diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index dae2bd6..c42849a 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -1,5 +1,3 @@ -// +build mqdev - /* © Copyright IBM Corporation 2018, 2019 diff --git a/install-mq.sh b/install-mq.sh index c4b2926..fe83ced 100644 --- a/install-mq.sh +++ b/install-mq.sh @@ -25,8 +25,8 @@ test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false # If MQ_PACKAGES isn't specifically set, then choose a valid set of defaults if [ -z "$MQ_PACKAGES" ]; then - $UBUNTU && MQ_PACKAGES="ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-msg-.* ibmmq-samples ibmmq-ams" - $RHEL && MQ_PACKAGES="MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm" + $UBUNTU && MQ_PACKAGES="ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-msg-.* ibmmq-samples ibmmq-ams ibmmq-web" + $RHEL && MQ_PACKAGES="MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm MQSeriesWeb-*.rpm" fi if ($UBUNTU); then diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh index c96bd62..93f09f4 100755 --- a/mq-advanced-server-rhel/mq-buildah.sh +++ b/mq-advanced-server-rhel/mq-buildah.sh @@ -121,6 +121,9 @@ buildah run --user root $ctr_mq -- chmod 0660 /run/termination-log install --mode 0550 --owner root --group root ./mq-advanced-server-rhel/writePackages.sh ${mnt_mq}/usr/local/bin/writePackages buildah run --user root $ctr_mq -- /usr/local/bin/writePackages +# Copy web XML files +cp -R web ${mnt_mq}/etc/mqm/web + ############################################################################### # Final Buildah commands ############################################################################### @@ -138,6 +141,7 @@ fi buildah config \ --port 1414/tcp \ --port 9157/tcp \ + --port 9443/tcp \ --os linux \ --label architecture=x86_64 \ --label io.openshift.tags="$OSTAG" \ diff --git a/mq-advanced-server-rhel/mqdev-buildah.sh b/mq-advanced-server-rhel/mqdev-buildah.sh index 1e7c84a..5778ec9 100755 --- a/mq-advanced-server-rhel/mqdev-buildah.sh +++ b/mq-advanced-server-rhel/mqdev-buildah.sh @@ -78,12 +78,7 @@ install --directory --mode 0775 --owner ${mqm_uid} --group 0 ${mnt_mq}/run/runmq cp ./incubating/mqadvanced-server-dev/*.tpl ${mnt_mq}/etc/mqm/ # Copy web XML files for default developer configuration -mkdir --parents ${mnt_mq}/etc/mqm/web -cp --recursive ./incubating/mqadvanced-server-dev/web/* ${mnt_mq}/etc/mqm/web/ - -# Make "mqm" the owner of all the config files -chown --recursive ${mqm_uid}:${mqm_gid} ${mnt_mq}/etc/mqm/* -chmod --recursive 0750 ${mnt_mq}/etc/mqm/* +cp -R incubating/mqadvanced-server-dev/web/ ${mnt_mq}/etc/mqm/web ############################################################################### # Final Buildah commands diff --git a/web/installations/Installation1/servers/mqweb/mqwebuser.xml b/web/installations/Installation1/servers/mqweb/mqwebuser.xml new file mode 100644 index 0000000..7bb6ae1 --- /dev/null +++ b/web/installations/Installation1/servers/mqweb/mqwebuser.xml @@ -0,0 +1,25 @@ + + + + appSecurity-2.0 + + + + + + + + + + + + + + + + + + + + + diff --git a/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/tls.xml b/web/installations/Installation1/servers/mqweb/tls.xml similarity index 100% rename from incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/tls.xml rename to web/installations/Installation1/servers/mqweb/tls.xml