From 37c4a872ae3af3fcf9b0753918768276a0c116b4 Mon Sep 17 00:00:00 2001 From: Les Peabody Date: Tue, 29 Oct 2019 16:13:11 -0400 Subject: [PATCH 1/3] Ports project volume cleanup from docksal#1058 (#51) --- bin/proxyctl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/proxyctl b/bin/proxyctl index 2611b4c..2e0e064 100755 --- 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" From f5af7ecf115fc5d3e97142ba365f0a44e178a338 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Wed, 13 Nov 2019 22:17:31 -0800 Subject: [PATCH 2/3] Fix tests Removed unnecessary DOCKSAL_STACK=none in docksal.env in test project configs --- tests/projects/project1/.docksal/docksal.env | 2 +- tests/projects/project2/.docksal/docksal.env | 1 - tests/projects/project3/.docksal/docksal.env | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/projects/project1/.docksal/docksal.env b/tests/projects/project1/.docksal/docksal.env index 0a9c8a0..8b13789 100644 --- 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 index 0a9c8a0..e69de29 100644 --- 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 index 0a9c8a0..e69de29 100644 --- a/tests/projects/project3/.docksal/docksal.env +++ b/tests/projects/project3/.docksal/docksal.env @@ -1 +0,0 @@ -DOCKSAL_STACK=none From 71eb3c06711143717cd4ee22cba765ddff769a52 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Wed, 13 Nov 2019 23:07:10 -0800 Subject: [PATCH 3/3] Switched Travis builds to Ubuntu 18.04 (bionic) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dcc8ed0..601962a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: bionic language: minimal