From b87f5811a9adc2e56806d92e968bf8731210f278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Fri, 31 Mar 2023 21:27:27 +0200 Subject: [PATCH] Updated generators and added 7.0.2 and 7.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- library/glassfish | 16 ++++++++++++---- test/tests/glassfish/run.sh | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/library/glassfish b/library/glassfish index 60f557af35d90..cf3107e270990 100644 --- a/library/glassfish +++ b/library/glassfish @@ -3,12 +3,20 @@ Maintainers: David Matejcek (@dmatej), Ondro Mihalyi (@ondromih) GitRepo: https://github.com/OmniFish-EE/docker-library-glassfish.git GitFetch: refs/heads/main -GitCommit: 3e22307467c6f9557077f9eb4d481e3ede8df30f +GitCommit: 36560c745bacc3ac22448dd00e45288322ff8883 Tags: 7.0.0, 7.0.0-jdk17, 7.0.0-jdk17-eclipse-temurin Architectures: amd64 -Directory: 7.0.0/src/main/docker +Directory: 7.0.0 -Tags: latest, 7.0.1, 7.0.1-jdk17, 7.0.1-jdk17-eclipse-temurin +Tags: 7.0.1, 7.0.1-jdk17, 7.0.1-jdk17-eclipse-temurin Architectures: amd64 -Directory: 7.0.1/src/main/docker +Directory: 7.0.1 + +Tags: 7.0.2, 7.0.2-jdk17, 7.0.2-jdk17-eclipse-temurin +Architectures: amd64 +Directory: 7.0.2 + +Tags: latest, 7.0.3, 7.0.3-jdk17, 7.0.3-jdk17-eclipse-temurin +Architectures: amd64 +Directory: 7.0.3 diff --git a/test/tests/glassfish/run.sh b/test/tests/glassfish/run.sh index c339512b540bb..6119babda7575 100755 --- a/test/tests/glassfish/run.sh +++ b/test/tests/glassfish/run.sh @@ -23,5 +23,5 @@ waitForLogLine 60 '^\s+Eclipse GlassFish\s+[\.0-9]+'; echo "GlassFish started as ${containerId}" docker stop "${containerId}" & -waitForLogLine 30 '^\s+Completed shutdown of GlassFish runtime'; +waitForLogLine 30 '^\s*Completed shutdown of GlassFish runtime'; echo "GlassFish stopped OK!"