Merge pull request #54 from docksal/develop

Release 1.5.2
docksal · Nov 14, 2019 · e8ac7b6 · e8ac7b6
2 parents c94d4e0 + 71eb3c0
commit e8ac7b6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 
 language: minimal
 

diff --git a/bin/proxyctl b/bin/proxyctl
@@ -256,6 +256,9 @@ cleanup ()
 		# Remove dangling project containers
 		log "Removing dangling project: ${project_name}..."
 		docker ps -qa --filter "label=com.docker.compose.project=${project_name}" | xargs docker rm -f
+		# Remove project volumes. "docker volume prune" (used below) does not remove the project_root volume.
+		# See https://github.com/moby/moby/issues/40152
+		docker volume ls -q --filter "label=com.docker.compose.project=${project_name}" | xargs docker volume rm -f
 		# Disconnect vhost-proxy from the project network and remove the network.
 		# See https://github.com/docksal/service-vhost-proxy/issues/6 for more details on why this is necessary.
 		local network="${project_name}_default"

diff --git a/tests/projects/project1/.docksal/docksal.env b/tests/projects/project1/.docksal/docksal.env
@@ -1 +1 @@
-DOCKSAL_STACK=none
+
diff --git a/tests/projects/project2/.docksal/docksal.env b/tests/projects/project2/.docksal/docksal.env
@@ -1 +0,0 @@
-DOCKSAL_STACK=none

diff --git a/tests/projects/project3/.docksal/docksal.env b/tests/projects/project3/.docksal/docksal.env
@@ -1 +0,0 @@
-DOCKSAL_STACK=none