Updates for Keycloak ECR changes

Author: sdmarshall79

Dockerfile-server

@@ -124,7 +124,7 @@ COPY ha/native-ha.ini.tpl /etc/mqm/native-ha.ini.tpl
 # Copy web XML files
 COPY web /etc/mqm/web
 COPY etc/mqm/*.tpl /etc/mqm/
-RUN ln -s /run/mqwebexternal.xml /etc/mqm/web/installations/Installation1/servers/mqweb/mqwebexternal.xml \
+RUN ln -s /run/mqwebcontainer.xml /etc/mqm/web/installations/Installation1/servers/mqweb/mqwebcontainer.xml \
   && ln -s /run/tls.xml /etc/mqm/web/installations/Installation1/servers/mqweb/tls.xml \
   && ln -s /run/jvm.options /etc/mqm/web/installations/Installation1/servers/mqweb/configDropins/defaults/jvm.options \
   && ln -s /run/15-tls.mqsc /etc/mqm/15-tls.mqsc \

cmd/runmqserver/main.go

@@ -171,15 +171,15 @@ func doMain() error {
 		return err
 	}
 
-	// Copy default mqwebexternal.xml file to ephemeral volume
+	// Copy default mqwebcontainer.xml file to ephemeral volume
 	if *devFlag && os.Getenv("MQ_DEV") == "true" {
-		err = copy.CopyFile("/etc/mqm/web/installations/Installation1/servers/mqweb/mqwebexternal.xml.dev", "/run/mqwebexternal.xml")
+		err = copy.CopyFile("/etc/mqm/web/installations/Installation1/servers/mqweb/mqwebcontainer.xml.dev", "/run/mqwebcontainer.xml")
 		if err != nil {
 			logTermination(err)
 			return err
 		}
 	} else {
-		err = copy.CopyFile("/etc/mqm/web/installations/Installation1/servers/mqweb/mqwebexternal.xml.default", "/run/mqwebexternal.xml")
+		err = copy.CopyFile("/etc/mqm/web/installations/Installation1/servers/mqweb/mqwebcontainer.xml.default", "/run/mqwebcontainer.xml")
 		if err != nil {
 			logTermination(err)
 			return err

incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebexternal.xml.dev renamed to incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebcontainer.xml.dev

@@ -40,5 +40,6 @@
     <variable name="mqConsoleEnableUnsafeInline" value="true"/>
     <jndiEntry jndiName="mqConsoleDefaultCCDTHostname" value="${env.MQ_CONSOLE_DEFAULT_CCDT_HOSTNAME}"/>
     <jndiEntry jndiName="mqConsoleDefaultCCDTPort" value="${env.MQ_CONSOLE_DEFAULT_CCDT_PORT}"/>
+    <httpDispatcher enableWelcomePage="false" appOrContextRootMissingMessage='&lt;script&gt;document.location.href="/ibmmq/console";&lt;/script&gt;' />
     <include location="tls.xml"/>
 </server>

setup-image.sh

@@ -76,5 +76,5 @@ sed -i 's/v7.0/v8.0/g' /opt/mqm/licenses/non_ibm_license.txt
 mkdir -p /licenses
 cp /opt/mqm/licenses/*.txt /licenses/
 
-# Update server.xml to include mqwebexternal.xml
-sed -i 's|<include location="mqwebuser.xml"/>|<include location="mqwebexternal.xml"/>\n    <include location="mqwebuser.xml"/>|' /opt/mqm/samp/web/server.xml
+# Update server.xml to include mqwebcontainer.xml & mqwebexternal.xml
+sed -i 's|<include location="mqwebuser.xml"/>|<include location="mqwebcontainer.xml"/>\n    <include location="mqwebexternal.xml"/>\n    <include location="mqwebuser.xml"/>|' /opt/mqm/samp/web/server.xml

test/container/docker_api_test.go

@@ -1949,8 +1949,8 @@ func TestRORFSVerifySymLinks(t *testing.T) {
 		symLinkName string
 	}{
 		{
-			origin:      "/etc/mqm/web/installations/Installation1/servers/mqweb/mqwebexternal.xml",
-			symLinkName: "-> /run/mqwebexternal.xml",
+			origin:      "/etc/mqm/web/installations/Installation1/servers/mqweb/mqwebcontainer.xml",
+			symLinkName: "-> /run/mqwebcontainer.xml",
 		},
 		{
 			origin:      "/etc/mqm/web/installations/Installation1/servers/mqweb/tls.xml",

web/installations/Installation1/servers/mqweb/mqwebexternal.xml.default renamed to web/installations/Installation1/servers/mqweb/mqwebcontainer.xml.default

@@ -9,5 +9,6 @@
     <variable name="mqConsoleEnableUnsafeInline" value="true"/>
     <jndiEntry jndiName="mqConsoleDefaultCCDTHostname" value="${env.MQ_CONSOLE_DEFAULT_CCDT_HOSTNAME}"/>
     <jndiEntry jndiName="mqConsoleDefaultCCDTPort" value="${env.MQ_CONSOLE_DEFAULT_CCDT_PORT}"/>
+    <httpDispatcher enableWelcomePage="false" appOrContextRootMissingMessage='&lt;script&gt;document.location.href="/ibmmq/console";&lt;/script&gt;' />
     <include location="tls.xml"/>
 </server>

web/installations/Installation1/servers/mqweb/mqwebexternal.xml,

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server></server>