Skip to content

Commit 0e10fe7

Browse files
Fix check prereqs
* Remove discourse docker image download check - this is done in launcher. * update attach check, attach </dev/null for stdin, this can cause open file descriptors to hang around when run when `source`-ing the script.
1 parent 17bc5aa commit 0e10fe7

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

launcher

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,7 @@ check_prereqs() {
120120
echo "WARNING: Docker version ${test} deprecated, recommend upgrade to ${docker_rec_version} or newer." >&2
121121
fi
122122

123-
# 4. discourse docker image is downloaded
124-
test=`$docker_path images | awk '{print $1 ":" $2 }' | grep "$image"`
125-
126-
# 5. running recommended git version
123+
# 4. running recommended git version
127124
test=($($git_path --version)) # Get git version string
128125
test=${test[2]//,/} # Get version alone and strip comma if exists
129126

@@ -147,16 +144,16 @@ check_prereqs() {
147144
exit 1
148145
fi
149146

150-
# 6. able to attach stderr / out / tty
151-
test=`$docker_path run -i --rm -a stdout -a stderr hello-world`
147+
# 5. able to attach stderr / out / tty
148+
test=`$docker_path run -i --rm -a stdout -a stderr hello-world </dev/null`
152149
if [[ "$test" =~ "Hello from Docker" ]] ; then : ; else
153150
echo "Your Docker installation is not working correctly" >&2
154151
echo >&2
155152
echo "See: https://meta.discourse.org/t/docker-error-on-bootstrap/13657/18?u=sam" >&2
156153
exit 1
157154
fi
158155

159-
# 7. enough space for the bootstrap on docker folder
156+
# 6. enough space for the bootstrap on docker folder
160157
folder=`$docker_path info --format '{{.DockerRootDir}}'`
161158
safe_folder=${folder:-/var/lib/docker}
162159
if [[ -d $safe_folder && $(stat -f --format="%a*%S" $safe_folder)/1024**3 -lt 5 ]] ; then

0 commit comments

Comments
 (0)