doc: recommend docker compose instead of docker-compose

NetApp · Jul 9, 2024 · 38cbbb0 · 38cbbb0
1 parent dec5f9b
commit 38cbbb0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -165,7 +165,7 @@ endif
 	@if [ "$(ci)" != "harvest.yml" ]; then cp $(ci) harvest.yml; else echo "Source and destination files are the same, skipping copy"; fi
 	@./bin/harvest generate docker full --port --output harvest-compose.yml
 	@docker build -f container/onePollerPerContainer/Dockerfile -t ghcr.io/netapp/harvest:latest . --no-cache --build-arg GO_VERSION=${GO_VERSION} --build-arg VERSION=${VERSION}
-	@docker-compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
+	@docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
 	@cp harvest.yml integration/test/
 	VERSION=${VERSION} INSTALL_DOCKER=1 ./integration/test/test.sh
 	VERSION=${VERSION} REGRESSION=1 ./integration/test/test.sh

diff --git a/cmd/tools/generate/generate.go b/cmd/tools/generate/generate.go
@@ -287,12 +287,12 @@ func generateDocker(kind int) {
 	if kind == harvest {
 		_, _ = fmt.Fprintf(os.Stderr,
 			"Start containers with:\n"+
-				color.Colorize("docker-compose -f "+opts.outputPath+" up -d --remove-orphans\n", color.Green))
+				color.Colorize("docker compose -f "+opts.outputPath+" up -d --remove-orphans\n", color.Green))
 	}
 	if kind == full {
 		_, _ = fmt.Fprintf(os.Stderr,
 			"Start containers with:\n"+
-				color.Colorize("docker-compose -f prom-stack.yml -f "+opts.outputPath+" up -d --remove-orphans\n", color.Green))
+				color.Colorize("docker compose -f prom-stack.yml -f "+opts.outputPath+" up -d --remove-orphans\n", color.Green))
 	}
 }
 

diff --git a/docs/install/containers.md b/docs/install/containers.md
@@ -106,7 +106,7 @@ By default, the above command uses the harvest configuration file(`harvest.yml`)
 Bring everything up :rocket:
 
 ```
-docker-compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
+docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
 ```
 
 ### Note on Docker Logging Configuration
@@ -158,7 +158,7 @@ you can start your Docker containers with the updated configuration
 that includes the 1-year data retention period by executing the command below:
 
 ```sh
-docker-compose -f prom-stack-prod.yml -f harvest-compose.yml up -d --remove-orphans
+docker compose -f prom-stack-prod.yml -f harvest-compose.yml up -d --remove-orphans
 ```
 
 ### Grafana
@@ -181,13 +181,13 @@ password: admin
 3. Run [docker compose up](#start-everything), for example,
 
 ```bash
-docker-compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
+docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
 ```
 
 ### Stop all containers
 
 ```
-docker-compose -f prom-stack.yml -f harvest-compose.yml down
+docker compose -f prom-stack.yml -f harvest-compose.yml down
 ```
 
 If you encounter the following error message while attempting to stop your Docker containers using `docker-compose down`
@@ -250,7 +250,7 @@ Make sure you don't skip this step. It is essential as it updates local copies o
 4. Restart your containers using the following:
 
 ```
-docker-compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
+docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
 ```
 
 ## Building Harvest Docker Image

diff --git a/docs/install/harvest-containers.md b/docs/install/harvest-containers.md
@@ -55,7 +55,7 @@ docker run --rm \
 Bring everything up :rocket:
 
 ```
-docker-compose -f harvest-compose.yml up -d --remove-orphans
+docker compose -f harvest-compose.yml up -d --remove-orphans
 ```
 
 
@@ -68,13 +68,13 @@ docker-compose -f harvest-compose.yml up -d --remove-orphans
 3. Run [docker compose up](#start-everything), for example,
 
 ```bash
-docker-compose -f harvest-compose.yml up -d --remove-orphans
+docker compose -f harvest-compose.yml up -d --remove-orphans
 ```
 
 ### Stop all containers
 
 ```
-docker-compose-f harvest-compose.yml down
+docker compose-f harvest-compose.yml down
 ```
 
 ### Upgrade Harvest
@@ -112,5 +112,5 @@ To upgrade Harvest:
 4. Restart your containers using the following:
 
    ```
-   docker-compose -f harvest-compose.yml up -d --remove-orphans
+   docker compose -f harvest-compose.yml up -d --remove-orphans
    ```
diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
@@ -175,7 +175,7 @@ pipeline {
                                   ghcr.io/netapp/harvest \
                                   generate docker full \
                                   --output harvest-compose.yml
-                                docker-compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
+                                docker compose -f prom-stack.yml -f harvest-compose.yml up -d --remove-orphans
                                 sleep 1m
                                 INSTALL_DOCKER=1 bash $WORKSPACE/harvest/integration/test/test.sh
                                 '''