Migrate to Docker Compose v2 (#133)

* Migrate to Docker Compose v2 * Docker Compose v2 - version is obsolete
apache · Jun 20, 2024 · b931923 · b931923
1 parent f49add4
commit b931923
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 10 deletions.
diff --git a/dynamic-router-eip/README.adoc b/dynamic-router-eip/README.adoc
@@ -42,7 +42,7 @@ On a system with Podman, your output might resemble the following:
 [source,text]
 ----
 Emulate Docker CLI using podman. Create /etc/containers/nodocker to quiet msg.
->>>> Executing external compose provider "/usr/bin/docker-compose". Please refer to the documentation for details. <<<<
+>>>> Executing external compose provider "/usr/bin/docker compose". Please refer to the documentation for details. <<<<
 
 [+] Running 6/6
  ✔ Network docker_test-dynamic-router  Created  0.0s
@@ -59,7 +59,7 @@ When running the application stack for the Multimodule example, it should be the
 Docker or Podman installed.  For Podman, please confirm that you have `podman compose` installed to ensure
 that you can emulate the Docker CLI when using Podman.
 
-    docker compose -f dynamic-router-eip/dynamic-router-eip-stack/project-resources/docker/docker-compose.yaml up -d
+    docker compose -f dynamic-router-eip/dynamic-router-eip-stack/project-resources/docker/compose.yaml up -d
 
 ==== Access the Swagger UI
 

diff --git a/...ject-resources/docker/docker-compose.yaml → ...ack/project-resources/docker/compose.yaml b/...ject-resources/docker/docker-compose.yaml → ...ack/project-resources/docker/compose.yaml
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version: "3.7"
 
 services:
   redpanda_broker:

diff --git a/opentelemetry/README.adoc b/opentelemetry/README.adoc
@@ -26,7 +26,7 @@ You will need to compile this example first:
 mvn compile
 ----
 
-All the following docker-compose commands should be run from this directory.
+All the following docker compose commands should be run from this directory.
 
 === Run the example
 
@@ -51,7 +51,7 @@ We suggest using multiple terminal windows to start the following components:
 
 [source,sh]
 ----
-docker-compose -f containers/docker-compose.yml up
+docker compose -f containers/compose.yaml up
 ----
 
 ==== Startup demo apps

diff --git a/opentelemetry/containers/docker-compose.yml → opentelemetry/containers/compose.yaml b/opentelemetry/containers/docker-compose.yml → opentelemetry/containers/compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 
 services:
 

diff --git a/saga/local-resources/docker-compose.yml → saga/local-resources/compose.yaml b/saga/local-resources/docker-compose.yml → saga/local-resources/compose.yaml
@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   lra-coordinator:
     image: "quay.io/jbosstm/lra-coordinator:latest"

diff --git a/saga/readme.adoc b/saga/readme.adoc
@@ -163,7 +163,7 @@ oc logs -f deploymentconfig/camel-example-spring-boot-saga-payment
 
 ==== Requirements
 
-- `docker-compose` installed (https://docs.docker.com/compose/install/[guide])
+- `docker compose` installed (https://docs.docker.com/compose/install/[guide])
 
 ==== Run script to execute services locally
 

diff --git a/saga/run-local.sh b/saga/run-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo running amq broker and lra-coordinator
-docker-compose -f local-resources/docker-compose.yml up -d
+docker compose -f local-resources/compose.yaml up -d
 
 echo compiling project
 mvn clean package

diff --git a/saga/stop-local.sh b/saga/stop-local.sh
@@ -13,4 +13,4 @@ echo stopping payment service
 kill -9 $(cat payment.pid) && rm payment.pid
 
 echo stopping amq broker and lra-coordinator
-docker-compose -f local-resources/docker-compose.yml stop
+docker compose -f local-resources/compose.yaml stop