Skip to content

Commit 437c8f2

Browse files
committed
Auto merge of #398 - posborne:fix-docker-builds, r=fiveop
ci: fix docker container check Newer version of docker no longer have the /.dockerinit file present when the container is executing, so that is no longer an option. When executing in a container, we do know that we will be executing as pid 1 -- this is probably not ever the case on the host system. r? @fiveop
2 parents cdecd1a + 90269e4 commit 437c8f2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
set -e
77

88
# This should only be run in a docker container, so verify that
9-
if [ ! -f /.dockerinit ]; then
9+
if [ ! $(pidof $0) = "1" ]; then
1010
echo "run.sh should only be executed in a docker container"
1111
echo "and that does not appear to be the case. Maybe you meant"
1212
echo "to execute the tests via run-all.sh or run-docker.sh."

0 commit comments

Comments
 (0)