Merge pull request #15115 from giuseppe/sc_drop_var_lib_docker

Automatic merge from submit-queue (batch tested with PRs 17476, 17143, 15115, 17094, 17500). node, syscontainer: drop /var/lib/docker mount point Reference: #15105 Signed-off-by: Giuseppe Scrivano <[email protected]>
openshift · Nov 29, 2017 · 404cb18 · 404cb18
2 parents 32c11e8 + d14bce0
commit 404cb18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/images/node/system-container/config.json.template b/images/node/system-container/config.json.template
@@ -414,10 +414,11 @@
         },
         {
 	    "type": "bind",
-	    "source": "/var/lib/docker",
-	    "destination": "/var/lib/docker",
+	    "source": "/var/lib/docker/containers",
+	    "destination": "/var/lib/docker/containers",
 	    "options": [
 		"bind",
+                "slave",
 		"rw",
 		"mode=755"
 	    ]

diff --git a/images/node/system-container/system-container-wrapper.sh b/images/node/system-container/system-container-wrapper.sh
@@ -1,4 +1,12 @@
 #!/bin/sh
 source /run/$NAME-env
 
+UMOUNT_TARGET=/var/lib/docker/containers
+
+findmnt -R -A -nuo TARGET --raw $UMOUNT_TARGET | tr -d '\r' | grep -v "^$UMOUNT_TARGET$" | \
+while read i;
+do
+    umount -lR $i
+done
+
 exec /usr/local/bin/origin-node-run.sh