Merge branch 'singularity' into sing2
This commit is contained in:
@@ -79,8 +79,6 @@ RUN chown -R mqm:mqm /etc/mqm/* \
|
|||||||
&& chmod +x /usr/local/bin/runmq* \
|
&& chmod +x /usr/local/bin/runmq* \
|
||||||
&& install --directory --mode 0775 --owner mqm --group root /run/runmqdevserver
|
&& install --directory --mode 0775 --owner mqm --group root /run/runmqdevserver
|
||||||
|
|
||||||
EXPOSE 9443
|
|
||||||
|
|
||||||
USER $MQM_UID
|
USER $MQM_UID
|
||||||
|
|
||||||
ENTRYPOINT ["runmqdevserver"]
|
ENTRYPOINT ["runmqdevserver"]
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ rm -rf ${DIR_EXTRACT}
|
|||||||
# Apply any bug fixes not included in base Ubuntu or MQ image.
|
# Apply any bug fixes not included in base Ubuntu or MQ image.
|
||||||
# Don't upgrade everything based on Docker best practices https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run
|
# Don't upgrade everything based on Docker best practices https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run
|
||||||
$UBUNTU && apt-get install -y libapparmor1 libsystemd0 systemd systemd-sysv libudev1 perl-base --only-upgrade
|
$UBUNTU && apt-get install -y libapparmor1 libsystemd0 systemd systemd-sysv libudev1 perl-base --only-upgrade
|
||||||
|
|
||||||
# End of bug fixes
|
# End of bug fixes
|
||||||
|
|
||||||
# Clean up cached files
|
# Clean up cached files
|
||||||
|
|||||||
@@ -125,6 +125,9 @@ buildah run --user root $ctr_mq -- /usr/local/bin/writePackages
|
|||||||
# Copy web XML files
|
# Copy web XML files
|
||||||
cp -R web ${mnt_mq}/etc/mqm/web
|
cp -R web ${mnt_mq}/etc/mqm/web
|
||||||
|
|
||||||
|
# Copy web XML files
|
||||||
|
cp -R web ${mnt_mq}/etc/mqm/web
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Final Buildah commands
|
# Final Buildah commands
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|||||||
Reference in New Issue
Block a user