Skip to content

Commit 946334a

Browse files
authored
Merge pull request #125 from kjsanger/feature/singularity-silent
Set Singularity logging to ERROR level
2 parents bcce454 + 63a6175 commit 946334a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

singularity/scripts/singularity-exec-docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ DOCKER_USER=${DOCKER_USER:?required, but not set}
77
DOCKER_IMAGE=${DOCKER_IMAGE:?required, but was not set}
88
DOCKER_TAG=${DOCKER_TAG:?required, but not set}
99

10-
singularity exec "docker://$DOCKER_REGISTRY/$DOCKER_USER/$DOCKER_IMAGE:$DOCKER_TAG" "$@"
10+
singularity --silent exec "docker://$DOCKER_REGISTRY/$DOCKER_USER/$DOCKER_IMAGE:$DOCKER_TAG" "$@"

singularity/scripts/singularity-run-docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ DOCKER_USER=${DOCKER_USER:?required, but not set}
77
DOCKER_IMAGE=${DOCKER_IMAGE:?required, but was not set}
88
DOCKER_TAG=${DOCKER_TAG:?required, but not set}
99

10-
singularity run "docker://$DOCKER_REGISTRY/$DOCKER_USER/$DOCKER_IMAGE:$DOCKER_TAG" "$@"
10+
singularity --silent run "docker://$DOCKER_REGISTRY/$DOCKER_USER/$DOCKER_IMAGE:$DOCKER_TAG" "$@"

singularity/scripts/singularity-service-docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ flock --exclusive --timeout $LOCK_TIMEOUT $FD || {
4444
exit 1
4545
}
4646

47-
if ! singularity instance list 2> >(logger -s -p user.err -t singularity-service-docker) |\
47+
if ! singularity --silent instance list 2> >(logger -s -p user.err -t singularity-service-docker) |\
4848
grep "$instance" 2>&1 >/dev/null
4949
then
5050
singularity --silent instance start "$DOCKER_URL" "$instance" 2> >(logger -s -p user.err -t singularity-service-docker) >/dev/null
5151
fi
5252

5353
clean_up
5454

55-
singularity exec "instance://$instance" "$@"
55+
singularity --silent exec "instance://$instance" "$@"

0 commit comments

Comments
 (0)