Merge pull request #126 from pivotal-cf/v33.0.x

Unmount the docker directories based on the job property: storage_driver
cloudfoundry-incubator · Jan 16, 2019 · 5039cbd · 5039cbd
2 parents 73bc55a + 7d6855e
commit 5039cbd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/jobs/docker/spec b/jobs/docker/spec
@@ -101,6 +101,7 @@ properties:
     default: false
   storage_driver:
     description: "Use a specific storage driver"
+    default: "overlay2"
   storage_options:
     description: "Array of storage driver options"
   shared_mounts_enable:

diff --git a/jobs/docker/templates/bin/ctl b/jobs/docker/templates/bin/ctl
@@ -108,16 +108,23 @@ case $1 in
     echo "DEBUG: Contents of /proc/mounts after stopping docker"
     cat /proc/mounts
 
-    mounts=$(cat /proc/mounts | grep "/var/vcap/store/docker/docker/overlay/.*" | awk '{print $2}')
+    mounts=$(cat /proc/mounts | grep "/var/vcap/store/docker/docker/${DOCKER_STORAGE_DRIVER_VALUE}/.*" | awk '{print $2}')
     for mount in $mounts; do
       echo "Unmounting $mount"
       umount $mount
     done
 
-    if [[ -d /var/vcap/store/docker/docker/overlay ]]; then
+    if [[ -d /var/vcap/store/docker/docker/${DOCKER_STORAGE_DRIVER_VALUE} ]]; then
       set +e
-      echo "Unmounting /var/vcap/store/docker/docker/overlay"
-      umount /var/vcap/store/docker/docker/overlay
+      echo "Unmounting /var/vcap/store/docker/docker/${DOCKER_STORAGE_DRIVER_VALUE}"
+      umount /var/vcap/store/docker/docker/${DOCKER_STORAGE_DRIVER_VALUE}
+      set -e
+    fi
+
+    if [[ -d /var/vcap/store/docker/docker ]]; then
+      set +e
+      echo "Unmounting /var/vcap/store/docker/docker"
+      umount /var/vcap/store/docker/docker
       set -e
     fi
     ;;

diff --git a/jobs/docker/templates/bin/job_properties.sh.erb b/jobs/docker/templates/bin/job_properties.sh.erb
@@ -148,10 +148,9 @@ export DOCKER_SELINUX_ENABLED="--selinux-enabled=<%= p('selinux_enable') %>"
 # Enable shared_mounts
 export DOCKER_SHARED_MOUNTS_ENABLE=<%= p('shared_mounts_enable') %>
 
-<% if_p('storage_driver') do |storage_driver| %>
 # Use a specific storage driver
-export DOCKER_STORAGE_DRIVER="--storage-driver=<%= storage_driver %>"
-<% end %>
+export DOCKER_STORAGE_DRIVER="--storage-driver=<%= p('storage_driver') %>"
+export DOCKER_STORAGE_DRIVER_VALUE="<%= p('storage_driver') %>"
 
 <% if_p('storage_options') do |storage_options| %>
 # Storage driver options