Removed custom OAM patch
This commit is contained in:
committed by
Luke J Powlett
parent
d95e44f57c
commit
a53fb7f49a
@@ -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 --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/*.ini /etc/mqm/
|
||||||
COPY etc/mqm/mq.htpasswd /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
|
RUN chmod 0660 /etc/mqm/mq.htpasswd
|
||||||
COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/
|
COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/
|
||||||
RUN chmod u+x /usr/local/bin/install-extra-packages.sh \
|
RUN chmod u+x /usr/local/bin/install-extra-packages.sh \
|
||||||
|
|||||||
8
Makefile
8
Makefile
@@ -259,7 +259,7 @@ build-advancedserver: registry-login log-build-env downloads/$(MQ_ARCHIVE) comma
|
|||||||
build-devserver-host: build-devserver
|
build-devserver-host: build-devserver
|
||||||
|
|
||||||
.PHONY: 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)))
|
$(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)
|
$(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)))
|
$(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)
|
$(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
|
.PHONY: registry-login
|
||||||
registry-login:
|
registry-login:
|
||||||
ifneq ($(REGISTRY_USER),)
|
ifneq ($(REGISTRY_USER),)
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
p915-ifix-L200325.DE
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user