Merge branch 'master' into java16-openj9

# Conflicts:
#	.github/workflows/build-multiarch.yml
#	Dockerfile
This commit is contained in:
Geoff Bourne committed 2021-05-21 16:46:51 -05:00
commit 7229c40202
7 files changed
+12 -9

No files matched your search

+1
View File
@@ -84,5 +84,6 @@ RUN dos2unix /start* && chmod +x /start*
RUN dos2unix /health.sh && chmod +x /health.sh
RUN dos2unix /autopause/* && chmod +x /autopause/*.sh
ENTRYPOINT [ "/start" ]
HEALTHCHECK --start-period=1m CMD /health.sh