diff --git a/Dockerfile-server b/Dockerfile-server index 2f1396b..58861d5 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -137,8 +137,6 @@ USER 0 COPY --from=builder /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/amqpas* /opt/mqm/lib64/ COPY etc/mqm/*.ini /etc/mqm/ COPY etc/mqm/mq.htpasswd /etc/mqm/ -COPY internal/qmgrauth/qmgroam/patch/* /opt/mqm/lib64/ -COPY etc/mqm/mqpatch.dat /opt/mqm/ RUN chmod 0660 /etc/mqm/mq.htpasswd COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/ RUN chmod u+x /usr/local/bin/install-extra-packages.sh \ diff --git a/Makefile b/Makefile index bf1de6f..9ba2c3a 100644 --- a/Makefile +++ b/Makefile @@ -259,7 +259,7 @@ build-advancedserver: registry-login log-build-env downloads/$(MQ_ARCHIVE) comma build-devserver-host: build-devserver .PHONY: build-devserver -build-devserver: registry-login log-build-env downloads/$(MQ_ARCHIVE_DEV) command-version patch-mq-dev +build-devserver: registry-login log-build-env downloads/$(MQ_ARCHIVE_DEV) command-version $(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)"$(END))) $(call build-mq,$(MQ_IMAGE_DEVSERVER),$(MQ_TAG),Dockerfile-server,$(MQ_ARCHIVE_DEV),mq-dev-server) @@ -276,12 +276,6 @@ build-sdk: registry-login downloads/$(MQ_ARCHIVE_DEV) $(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_SDK)"$(END))) $(call build-mq,mq-sdk,$(MQ_TAG),incubating/mq-sdk/Dockerfile,$(MQ_SDK_ARCHIVE),mq-sdk) -.PHONY: patch-mq-dev -patch-mq-dev: - $(info $(shell printf $(TITLE)"Generate MQ Developer Patch"$(END))) - mkdir -p internal/qmgrauth/qmgroam/patch - cp internal/qmgrauth/qmgroam/$(ARCH)/* internal/qmgrauth/qmgroam/patch/ - .PHONY: registry-login registry-login: ifneq ($(REGISTRY_USER),) diff --git a/etc/mqm/mqpatch.dat b/etc/mqm/mqpatch.dat deleted file mode 100644 index 976526c..0000000 --- a/etc/mqm/mqpatch.dat +++ /dev/null @@ -1 +0,0 @@ -p915-ifix-L200325.DE diff --git a/internal/qmgrauth/qmgroam/amd64/amqzfu b/internal/qmgrauth/qmgroam/amd64/amqzfu deleted file mode 100755 index a17334b..0000000 Binary files a/internal/qmgrauth/qmgroam/amd64/amqzfu and /dev/null differ diff --git a/internal/qmgrauth/qmgroam/amd64/libmqmz1_r.so b/internal/qmgrauth/qmgroam/amd64/libmqmz1_r.so deleted file mode 100755 index d5460d0..0000000 Binary files a/internal/qmgrauth/qmgroam/amd64/libmqmz1_r.so and /dev/null differ diff --git a/internal/qmgrauth/qmgroam/ppc64le/amqzfu b/internal/qmgrauth/qmgroam/ppc64le/amqzfu deleted file mode 100755 index 0d27fcd..0000000 Binary files a/internal/qmgrauth/qmgroam/ppc64le/amqzfu and /dev/null differ diff --git a/internal/qmgrauth/qmgroam/ppc64le/libmqmz1_r.so b/internal/qmgrauth/qmgroam/ppc64le/libmqmz1_r.so deleted file mode 100755 index b2fce5d..0000000 Binary files a/internal/qmgrauth/qmgroam/ppc64le/libmqmz1_r.so and /dev/null differ diff --git a/internal/qmgrauth/qmgroam/s390x/amqzfu b/internal/qmgrauth/qmgroam/s390x/amqzfu deleted file mode 100755 index 170d528..0000000 Binary files a/internal/qmgrauth/qmgroam/s390x/amqzfu and /dev/null differ diff --git a/internal/qmgrauth/qmgroam/s390x/libmqmz1_r.so b/internal/qmgrauth/qmgroam/s390x/libmqmz1_r.so deleted file mode 100755 index abf1dd0..0000000 Binary files a/internal/qmgrauth/qmgroam/s390x/libmqmz1_r.so and /dev/null differ