diff --git a/.docker/gs64/docker-tests.sh b/.docker/gs64/docker-tests.sh index 939f60c..2cc8e0d 100755 --- a/.docker/gs64/docker-tests.sh +++ b/.docker/gs64/docker-tests.sh @@ -59,9 +59,9 @@ docker run --rm --detach --name gs64-stone \ -e TZ="America/Argentina/Buenos_Aires" \ --cap-add=SYS_RESOURCE \ --network=launchpad-net \ - --volume=$PWD:/opt/gemstone/projects/Launchpad:ro \ - --volume=$PWD/.docker/gs64/gem.conf:/opt/gemstone/conf/gem.conf \ - --volume=$PWD/.docker/gs64/gemstone.key:/opt/gemstone/product/sys/gemstone.key:ro \ + --volume="$PWD":/opt/gemstone/projects/Launchpad:ro \ + --volume="$PWD"/.docker/gs64/gem.conf:/opt/gemstone/conf/gem.conf \ + --volume="$PWD"/.docker/gs64/gemstone.key:/opt/gemstone/product/sys/gemstone.key:ro \ ghcr.io/ba-st/gs64-rowan:v3.7.0 sleep 1 @@ -83,7 +83,7 @@ executeWithArguments docker run \ -e GS64_STONE_HOSTNAME="gs64-stone" \ --cap-add=SYS_RESOURCE \ --network=launchpad-net \ - --volume=$PWD/.docker/gs64/gem.conf:/opt/gemstone/conf/gem.conf \ + --volume="$PWD"/.docker/gs64/gem.conf:/opt/gemstone/conf/gem.conf \ launchpad-examples-gs64:sut assertOutputIncludesMessage '[INFO]' out assertOutputIncludesMessage "Hi Mr. DJ!" out diff --git a/docker/gs64/launchpad-gem b/docker/gs64/launchpad-gem index efc9f11..b18c24e 100755 --- a/docker/gs64/launchpad-gem +++ b/docker/gs64/launchpad-gem @@ -35,11 +35,11 @@ startnetldi \ -l "${GEMSTONE_LOG_DIR}/${NETLDI_SERVICE_NAME}.log" \ -D "${GEMSTONE_LOG_DIR}" \ ${NETLDI_ARGS:-} \ - "${NETLDI_SERVICE_NAME}" + "${NETLDI_SERVICE_NAME}" >> "${GEMSTONE_LOG_DIR}/startnetldi.log" # list GemStone services -gslist -cvl +gslist -cvl >> "${GEMSTONE_LOG_DIR}/startnetldi.log" -topaz -l -I "${LAUNCHPAD_TOPAZ_SCRIPT}" -S "${GEMSTONE_GLOBAL_DIR}/command-line-handler.tpz" -- launchpad "$@" & +topaz -l -q -I "${LAUNCHPAD_TOPAZ_SCRIPT}" -S "${GEMSTONE_GLOBAL_DIR}/command-line-handler.tpz" -- launchpad "$@" & pid="$!" wait "$pid"