From 27714b1e7db98c8a279bb434c3c837f395cd9ab4 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Tue, 13 Nov 2018 00:04:55 -0800
Subject: [PATCH] Attempt to fix docker-lib.sh script

See gh-15158
---
 ci/images/docker-lib.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh
index 0148b18f592..4c7b1d585ed 100644
--- a/ci/images/docker-lib.sh
+++ b/ci/images/docker-lib.sh
@@ -1,6 +1,6 @@
 # Based on: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh
 
-LOG_FILE=${LOG_FILE:-/tmp/docker.log}
+DOCKER_LOG_FILE=${DOCKER_LOG_FILE:-/tmp/docker.log}
 SKIP_PRIVILEGED=${SKIP_PRIVILEGED:-false}
 STARTUP_TIMEOUT=${STARTUP_TIMEOUT:-120}
 
@@ -77,7 +77,7 @@ start_docker() {
   fi
 
   try_start() {
-    dockerd --data-root /scratch/docker ${server_args} >$LOG_FILE 2>&1 &
+    dockerd --data-root /scratch/docker ${server_args} >$DOCKER_LOG_FILE 2>&1 &
     echo $! > /tmp/docker.pid
 
     sleep 1
@@ -91,7 +91,7 @@ start_docker() {
     done
   }
 
-  export server_args LOG_FILE
+  export server_args DOCKER_LOG_FILE
   declare -fx try_start
   trap stop_docker EXIT