chore(ci): Replace usages of docker-compose with docker compose (#…

…21009) * chore(ci): Replace usages of `docker-compose` with `docker compose` `docker-compose` usage has been removed from GHA runners as of July 29th, 2024. See https://github.blog/changelog/2024-04-10-github-hosted-runner-images-deprecation-notice-docker-compose-v1/ Signed-off-by: Jesse Szwedko <[email protected]> * Use argument for `compose` Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
vectordotdev · Aug 6, 2024 · 2fbb072 · 2fbb072
1 parent f1a1e1c
commit 2fbb072
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/scripts/environment/bootstrap-ubuntu-20.04.sh b/scripts/environment/bootstrap-ubuntu-20.04.sh
@@ -105,12 +105,6 @@ if ! [ -x "$(command -v docker)" ]; then
     usermod --append --groups docker ubuntu || true
 fi
 
-# docker-compose
-if ! [ -x "$(command -v docker-compose)" ]; then
-  curl -fsSL "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-$(uname -m)" -o /usr/local/bin/docker-compose
-  chmod +x /usr/local/bin/docker-compose
-fi
-
 bash scripts/environment/install-protoc.sh
 
 # Node.js, npm and yarn.

diff --git a/scripts/integration/README.md b/scripts/integration/README.md
@@ -3,7 +3,7 @@ This directory contains a set of integration test frameworks for vector which ar
 
 Each directory contains two files:
 
-1. A `compose.yaml` file containing the instructions to `docker-compose` or `podman-compose` for how
+1. A `compose.yaml` file containing the instructions to `docker compose` or `podman compose` for how
    to set up the containers in which to run the integrations, and
 2. A `test.yaml` file that describes how to run the integration tests, including a matrix of
    software versions or other parameters over which the tests will be run.

diff --git a/vdev/src/testing/config.rs b/vdev/src/testing/config.rs
@@ -126,8 +126,7 @@ pub struct ComposeTestConfig {
 #[serde(deny_unknown_fields)]
 pub struct IntegrationRunnerConfig {
     /// The set of environment variables to set in just the runner. This is used for settings that
-    /// might otherwise affect the operation of either docker or docker-compose but are needed in
-    /// the runner.
+    /// might otherwise affect the operation of docker but are needed in the runner.
     #[serde(default)]
     pub env: Environment,
     /// The set of volumes that need to be mounted into the runner.

diff --git a/vdev/src/testing/integration.rs b/vdev/src/testing/integration.rs
@@ -276,9 +276,8 @@ impl Compose {
     }
 
     fn run(&self, action: &str, args: &[&'static str], config: Option<&Environment>) -> Result<()> {
-        let mut command = CONTAINER_TOOL.clone();
-        command.push("-compose");
-        let mut command = Command::new(command);
+        let mut command = Command::new(CONTAINER_TOOL.clone());
+        command.arg("compose");
         // When the integration test environment is already active, the tempfile path does not
         // exist because `Compose::new()` has not been called. In this case, the `stop` command
         // needs to use the calculated path from the integration name instead of the nonexistent

diff --git a/website/cue/reference/administration/management.cue b/website/cue/reference/administration/management.cue
@@ -124,7 +124,7 @@ administration: management: {
 						command to access Vector's logs:
 
 						```bash
-						docker-compose logs -f vector
+						docker compose logs -f vector
 						```
 
 						Replace `vector` with the name of Vector's service if you've named it something else.