Skip to content

Commit 27714b1

Browse files
committed
Attempt to fix docker-lib.sh script
See gh-15158
1 parent e8eaeba commit 27714b1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci/images/docker-lib.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Based on: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh
22

3-
LOG_FILE=${LOG_FILE:-/tmp/docker.log}
3+
DOCKER_LOG_FILE=${DOCKER_LOG_FILE:-/tmp/docker.log}
44
SKIP_PRIVILEGED=${SKIP_PRIVILEGED:-false}
55
STARTUP_TIMEOUT=${STARTUP_TIMEOUT:-120}
66

@@ -77,7 +77,7 @@ start_docker() {
7777
fi
7878

7979
try_start() {
80-
dockerd --data-root /scratch/docker ${server_args} >$LOG_FILE 2>&1 &
80+
dockerd --data-root /scratch/docker ${server_args} >$DOCKER_LOG_FILE 2>&1 &
8181
echo $! > /tmp/docker.pid
8282

8383
sleep 1
@@ -91,7 +91,7 @@ start_docker() {
9191
done
9292
}
9393

94-
export server_args LOG_FILE
94+
export server_args DOCKER_LOG_FILE
9595
declare -fx try_start
9696
trap stop_docker EXIT
9797

0 commit comments

Comments
 (0)