docker: install with custom runDir

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>

scripts/setup-docker-linux.sh

@@ -18,6 +18,8 @@ if ! command -v dockerd &> /dev/null; then
   false
 fi
 
+mkdir -p "$RUNDIR"
+
 (
   echo "Starting dockerd"
   set -x
@@ -31,21 +33,16 @@ fi
 ) &
 
 tries=60
-echo "Waiting for daemon to start..."
 while ! docker version &> /dev/null; do
-	((tries--))
-	if [ $tries -le 0 ]; then
-		printf "\n"
-		if [ -z "$DOCKER_HOST" ]; then
-			echo >&2 "error: daemon failed to start"
-			echo >&2 "  check $RUNDIR/docker.log for details"
-		else
-			echo >&2 "error: daemon at $DOCKER_HOST fails to 'docker version':"
-			docker version >&2 || true
-		fi
-		false
-	fi
-	printf "."
-	sleep 2
+  ((tries--))
+  if [ $tries -le 0 ]; then
+    if [ -z "$DOCKER_HOST" ]; then
+      echo >&2 "error: daemon failed to start"
+    else
+      echo >&2 "error: daemon at $DOCKER_HOST fails to 'docker version':"
+      docker version >&2 || true
+    fi
+    false
+  fi
+  sleep 2
 done
-printf "\n"

scripts/setup-docker-win.ps1

@@ -3,8 +3,8 @@ param(
     [Parameter(Mandatory = $true)]
     [string]$ToolDir,
 
-    [Parameter(Mandatory = $false)]
-    [string]$TmpDir,
+    [Parameter(Mandatory = $true)]
+    [string]$RunDir,
 
     [Parameter(Mandatory = $true)]
     [string]$DockerHost)
@@ -12,9 +12,8 @@ param(
 $pwver = (Get-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\PowerShell\3\PowerShellEngine -Name 'PowerShellVersion').PowerShellVersion
 Write-Host "PowerShell version: $pwver"
 
-# Create temp directory
-if (!$TmpDir) { $TmpDir = $env:TEMP }
-New-Item -ItemType Directory "$TmpDir" -ErrorAction SilentlyContinue | Out-Null
+# Create run directory
+New-Item -ItemType Directory "$RunDir" -ErrorAction SilentlyContinue | Out-Null
 
 # Remove existing service
 if (Get-Service docker -ErrorAction SilentlyContinue) {
@@ -37,14 +36,14 @@ $env:DOCKER_HOST = $DockerHost
 Write-Host "DOCKER_HOST: $env:DOCKER_HOST"
 
 Write-Host "Creating service"
-New-Item -ItemType Directory "$TmpDir\moby-root" -ErrorAction SilentlyContinue | Out-Null
-New-Item -ItemType Directory "$TmpDir\moby-exec" -ErrorAction SilentlyContinue | Out-Null
+New-Item -ItemType Directory "$RunDir\moby-root" -ErrorAction SilentlyContinue | Out-Null
+New-Item -ItemType Directory "$RunDir\moby-exec" -ErrorAction SilentlyContinue | Out-Null
 Start-Process -Wait -NoNewWindow "$ToolDir\dockerd" `
   -ArgumentList `
     "--host=$DockerHost", `
-    "--data-root=$TmpDir\moby-root", `
-    "--exec-root=$TmpDir\moby-exec", `
-    "--pidfile=$TmpDir\docker.pid", `
+    "--data-root=$RunDir\moby-root", `
+    "--exec-root=$RunDir\moby-exec", `
+    "--pidfile=$RunDir\docker.pid", `
     "--register-service"
 Write-Host "Starting service"
 Start-Service -Name docker