From 5593c636f7bd0017c7d6a0c09ca62cb59687ca3e Mon Sep 17 00:00:00 2001 From: Angelo Cali Date: Mon, 19 Feb 2024 17:39:57 +0100 Subject: [PATCH 1/5] changed down() to downAll() for docker-compose 0.24.4 --- packages/env/lib/commands/destroy.js | 2 +- packages/env/lib/commands/stop.js | 2 +- packages/env/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/env/lib/commands/destroy.js b/packages/env/lib/commands/destroy.js index 20f76250271a9e..342839925ba7ce 100644 --- a/packages/env/lib/commands/destroy.js +++ b/packages/env/lib/commands/destroy.js @@ -59,7 +59,7 @@ module.exports = async function destroy( { spinner, scripts, debug } ) { spinner.text = 'Removing docker images, volumes, and networks.'; - await dockerCompose.down( { + await dockerCompose.downAll( { config: config.dockerComposeConfigPath, commandOptions: [ '--volumes', '--remove-orphans', '--rmi', 'all' ], log: debug, diff --git a/packages/env/lib/commands/stop.js b/packages/env/lib/commands/stop.js index 5393ef8c6a000f..80a2e214e7d116 100644 --- a/packages/env/lib/commands/stop.js +++ b/packages/env/lib/commands/stop.js @@ -24,7 +24,7 @@ module.exports = async function stop( { spinner, debug } ) { spinner.text = 'Stopping WordPress.'; - await dockerCompose.down( { + await dockerCompose.downAll( { config: dockerComposeConfigPath, log: debug, } ); diff --git a/packages/env/package.json b/packages/env/package.json index 05c43ee62accba..ab2d76083247b5 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -34,7 +34,7 @@ "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.3", + "docker-compose": "^0.24.4", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", From 82201542cdbae80ed5ff336f712edfb44a0ebb49 Mon Sep 17 00:00:00 2001 From: Angelo Cali Date: Mon, 19 Feb 2024 18:01:30 +0100 Subject: [PATCH 2/5] adapt package-lock.json to 0.24.4 --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ca357997a7f5a..193864f89dc7fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55388,7 +55388,7 @@ "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.3", + "docker-compose": "^0.24.4", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", @@ -70481,7 +70481,7 @@ "requires": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.3", + "docker-compose": "^0.24.4", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", From e8234d5c1986f1207750ad71fc37d03c3f1b2e6c Mon Sep 17 00:00:00 2001 From: Angelo Cali Date: Mon, 19 Feb 2024 22:38:05 +0100 Subject: [PATCH 3/5] fix package-lock.json issue and bump to 0.24.5 --- package-lock.json | 15 ++++++++------- packages/env/package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 193864f89dc7fb..bc71c4d68b30ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55388,7 +55388,7 @@ "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.4", + "docker-compose": "^0.24.5", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", @@ -55418,9 +55418,9 @@ } }, "packages/env/node_modules/docker-compose": { - "version": "0.24.2", - "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.2.tgz", - "integrity": "sha512-2/WLvA7UZ6A2LDLQrYW0idKipmNBWhtfvrn2yzjC5PnHDzuFVj1zAZN6MJxVMKP0zZH8uzAK6OwVZYHGuyCmTw==", + "version": "0.24.5", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.5.tgz", + "integrity": "sha512-cYIi9atSf/J5qhd5/7QMqnyqogkH34TbsoN9Lit1BgEzVlY/Z/Sd0HNOBa6Sk/67YNUjzAKxaz2P1RRSBD42kw==", "dev": true, "dependencies": { "yaml": "^2.2.2" @@ -70481,7 +70481,7 @@ "requires": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.4", + "docker-compose": "^0.24.5", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", @@ -70505,8 +70505,9 @@ } }, "docker-compose": { - "version": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.2.tgz", - "integrity": "sha512-2/WLvA7UZ6A2LDLQrYW0idKipmNBWhtfvrn2yzjC5PnHDzuFVj1zAZN6MJxVMKP0zZH8uzAK6OwVZYHGuyCmTw==", + "version": "0.24.5", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.5.tgz", + "integrity": "sha512-cYIi9atSf/J5qhd5/7QMqnyqogkH34TbsoN9Lit1BgEzVlY/Z/Sd0HNOBa6Sk/67YNUjzAKxaz2P1RRSBD42kw==", "dev": true, "requires": { "yaml": "^2.2.2" diff --git a/packages/env/package.json b/packages/env/package.json index ab2d76083247b5..837448ac1b4ac5 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -34,7 +34,7 @@ "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.4", + "docker-compose": "^0.24.5", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", From e6050dda5bdf2b83f93cab577a7c8eda96fd3f10 Mon Sep 17 00:00:00 2001 From: Angelo Cali Date: Mon, 19 Feb 2024 22:57:45 +0100 Subject: [PATCH 4/5] add changelog entry --- packages/env/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md index ca7d77adfe7bf2..d497ad9c0b9afa 100644 --- a/packages/env/CHANGELOG.md +++ b/packages/env/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +### Bug Fix + +- Update `docker-compose` dependency to `0.24.5` and change method calls from `down()` to the new `downAll()`. + ## 9.3.0 (2024-02-09) ## 9.2.0 (2024-01-24) From a0d89fbed4aeadc5ccee006139f0d4b07954bfd9 Mon Sep 17 00:00:00 2001 From: Angelo Cali Date: Tue, 20 Feb 2024 10:17:29 +0100 Subject: [PATCH 5/5] increase docker-compose version to 0.24.6 --- package-lock.json | 16 ++++++++-------- packages/env/CHANGELOG.md | 2 +- packages/env/package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index bc71c4d68b30ed..78a9a711597dc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55388,7 +55388,7 @@ "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.5", + "docker-compose": "^0.24.6", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", @@ -55418,9 +55418,9 @@ } }, "packages/env/node_modules/docker-compose": { - "version": "0.24.5", - "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.5.tgz", - "integrity": "sha512-cYIi9atSf/J5qhd5/7QMqnyqogkH34TbsoN9Lit1BgEzVlY/Z/Sd0HNOBa6Sk/67YNUjzAKxaz2P1RRSBD42kw==", + "version": "0.24.6", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.6.tgz", + "integrity": "sha512-VidlUyNzXMaVsuM79sjSvwC4nfojkP2VneL+Zfs538M2XFnffZDhx6veqnz/evCNIYGyz5O+1fgL6+g0NLWTBA==", "dev": true, "dependencies": { "yaml": "^2.2.2" @@ -70481,7 +70481,7 @@ "requires": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.5", + "docker-compose": "^0.24.6", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0", @@ -70505,9 +70505,9 @@ } }, "docker-compose": { - "version": "0.24.5", - "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.5.tgz", - "integrity": "sha512-cYIi9atSf/J5qhd5/7QMqnyqogkH34TbsoN9Lit1BgEzVlY/Z/Sd0HNOBa6Sk/67YNUjzAKxaz2P1RRSBD42kw==", + "version": "0.24.6", + "resolved": "https://registry.npmjs.org/docker-compose/-/docker-compose-0.24.6.tgz", + "integrity": "sha512-VidlUyNzXMaVsuM79sjSvwC4nfojkP2VneL+Zfs538M2XFnffZDhx6veqnz/evCNIYGyz5O+1fgL6+g0NLWTBA==", "dev": true, "requires": { "yaml": "^2.2.2" diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md index d497ad9c0b9afa..260d5089a04219 100644 --- a/packages/env/CHANGELOG.md +++ b/packages/env/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bug Fix -- Update `docker-compose` dependency to `0.24.5` and change method calls from `down()` to the new `downAll()`. +- Update `docker-compose` dependency to `0.24.6` and change method calls from `down()` to the new `downAll()`. ## 9.3.0 (2024-02-09) diff --git a/packages/env/package.json b/packages/env/package.json index 837448ac1b4ac5..ccb2e7be78cd2f 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -34,7 +34,7 @@ "dependencies": { "chalk": "^4.0.0", "copy-dir": "^1.3.0", - "docker-compose": "^0.24.5", + "docker-compose": "^0.24.6", "extract-zip": "^1.6.7", "got": "^11.8.5", "inquirer": "^7.1.0",