diff --git a/Dockerfile-server b/Dockerfile-server index 79cf707..5633e6d 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -143,6 +143,7 @@ COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/ # Copy web XML files for default developer configuration COPY incubating/mqadvanced-server-dev/web /etc/mqm/web RUN chown -R 1001:root /etc/mqm/* \ + && chmod -R g+w /etc/mqm/web \ && chmod +x /usr/local/bin/runmq* \ && install --directory --mode 0775 --owner 1001 --group root /run/runmqdevserver ENV MQ_ENABLE_EMBEDDED_WEB_SERVER=1 MQ_GENERATE_CERTIFICATE_HOSTNAME=localhost diff --git a/cmd/runmqdevserver/main.go b/cmd/runmqdevserver/main.go index 1cf6763..54356d9 100644 --- a/cmd/runmqdevserver/main.go +++ b/cmd/runmqdevserver/main.go @@ -1,5 +1,5 @@ /* -© Copyright IBM Corporation 2018, 2019 +© Copyright IBM Corporation 2018, 2020 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import ( "os/exec" "syscall" - "github.com/ibm-messaging/mq-container/internal/mqtemplate" "github.com/ibm-messaging/mq-container/pkg/containerruntimelogger" "github.com/ibm-messaging/mq-container/pkg/logger" "github.com/ibm-messaging/mq-container/pkg/name" @@ -89,11 +88,6 @@ func configureLogger() error { return nil } -func configureWeb(qmName string) error { - out := "/etc/mqm/web/installations/Installation1/angular.persistence/admin.json" - return mqtemplate.ProcessTemplateFile("/etc/mqm/admin.json.tpl", out, map[string]string{"QueueManagerName": qmName}, log) -} - func logTerminationf(format string, args ...interface{}) { logTermination(fmt.Sprintf(format, args...)) } @@ -147,18 +141,6 @@ func doMain() error { return err } - name, err := name.GetQueueManagerName() - if err != nil { - logTerminationf("Error getting queue manager name: %v", err) - return err - } - - err = configureWeb(name) - if err != nil { - logTermination("Error configuring admin.json") - return err - } - return nil }