Add test fixes and fix mq-explorer build

This commit is contained in:
Robert Parker
2019-02-28 12:35:39 +00:00
parent 6848038165
commit d4df05fd2a
7 changed files with 74 additions and 14 deletions

View File

@@ -18,7 +18,7 @@ FROM ubuntu:16.04
ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev911_ubuntu_x86-64.tar.gz
# The MQ packages to install
ARG MQ_PACKAGES="ibmmq-explorer"
ARG MQ_PACKAGES
ARG MQM_UID=999
@@ -29,7 +29,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
libxtst6
ADD install-mq.sh /usr/local/bin/
RUN chmod u+x /usr/local/bin/install-mq.sh $MQM_UID \
RUN chmod u+x /usr/local/bin/install-mq.sh \
&& install-mq.sh
ENV LANG=en_US.UTF-8

View File

@@ -71,11 +71,13 @@ COPY --from=builder /go/src/github.com/ibm-messaging/mq-container/runmqserver /u
COPY --from=builder /go/src/github.com/ibm-messaging/mq-container/runmqdevserver /usr/local/bin/
# Copy template files
COPY --chown=mqm:mqm incubating/mqadvanced-server-dev/*.tpl /etc/mqm/
COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/
# Copy web XML files for default developer configuration
COPY --chown=mqm:mqm incubating/mqadvanced-server-dev/web /etc/mqm/web
COPY incubating/mqadvanced-server-dev/web /etc/mqm/web
RUN chmod +x /usr/local/bin/runmq* \
RUN chown -R mqm:mqm /etc/mqm/* \
&& ls -lar /etc/mqm/ \
&& chmod +x /usr/local/bin/runmq* \
&& install --directory --mode 0775 --owner mqm --group root /run/runmqdevserver
EXPOSE 9443