From 5bee26cff56092ed22928ecf8bb590a692f95010 Mon Sep 17 00:00:00 2001
From: nfawbert <62660788+nfawbert@users.noreply.github.com>
Date: Fri, 28 Jan 2022 15:49:52 +0000
Subject: [PATCH 1/2] Fix docker-compose v2 issue and re-release to include
 clamav role (#68)

---
 RELEASE                   | 4 ++--
 package.json              | 2 +-
 src/controller-manager.ts | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASE b/RELEASE
index b1aff8c..0534519 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
-1.1.17
-Release to repackage ce-dev to force d8 compatible drush version.
+1.1.18
+Release to repackage ce-dev to fix docker-compose v2 volumes issue and install clamav role.
diff --git a/package.json b/package.json
index 0546524..8b5cbc4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ce-dev",
   "description": "Local Stack wrapper tool",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "author": " @pm98zz-c",
   "bin": {
     "ce-dev": "./bin/run"
diff --git a/src/controller-manager.ts b/src/controller-manager.ts
index 974bd4a..9d51cc5 100644
--- a/src/controller-manager.ts
+++ b/src/controller-manager.ts
@@ -245,6 +245,9 @@ export default class ControllerManager {
           volumes: [
             'ce_dev_ssh:/home/ce-dev/.ssh',
             'ce_dev_mkcert:/home/ce-dev/.local/share/mkcert',
+            'ce_dev_apt_cache:/var/cache/apt/archives',
+            'ce_dev_composer_cache:/home/ce-dev/.composer/cache',
+            'ce_dev_nvm_node:/home/ce-dev/.nvm/versions/node',
             '/sys/fs/cgroup:/sys/fs/cgroup:ro',
             this.config.cacheDir + ':/home/ce-dev/.ce-dev-cache',
           ],

From 133d6d472e54e2580fd88b7eea8da17a5d36a961 Mon Sep 17 00:00:00 2001
From: Nick Fawbert <nick.fawbert@codeenigma.com>
Date: Wed, 2 Feb 2022 10:15:19 +0000
Subject: [PATCH 2/2] Killing old ce-dev container when updating

---
 install.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 0f1a5ba..8f04ac2 100644
--- a/install.sh
+++ b/install.sh
@@ -46,5 +46,15 @@ if [ -f /usr/local/bin/ce-dev ]; then
 fi
 sudo ln -s /opt/ce-dev/bin/ce-dev /usr/local/bin/ce-dev
 echo "done."
+
+echo "Killing deprecated running ce_dev_controller container..."
+if [ "$(docker ps -q -f name=ce_dev_controller)" ]; then
+    if [ "$(docker ps -aq -f status=running -f name=ce_dev_controller)" ]; then
+        # cleanup
+        docker kill ce_dev_controller
+    fi
+fi
+echo "done."
+
 echo
-echo "All done."
\ No newline at end of file
+echo "All done."