diff --git a/examples/basic/Makefile b/examples/basic/Makefile index b90bfe8..c648e50 100644 --- a/examples/basic/Makefile +++ b/examples/basic/Makefile @@ -1,6 +1,6 @@ run: -make down - docker-compose up --build + docker compose up --build down: - docker-compose down --remove-orphans \ No newline at end of file + docker compose down --remove-orphans \ No newline at end of file diff --git a/examples/basic/README.md b/examples/basic/README.md index 9f85e69..c8b447c 100644 --- a/examples/basic/README.md +++ b/examples/basic/README.md @@ -2,24 +2,24 @@ An HTTP server using go-chi/chi and instrumentation. The server has a `/users/{id:[0-9]+}` endpoint. The server generates span information to `stdout`. -These instructions expect you to have [docker-compose](https://docs.docker.com/compose/) installed. +These instructions expect you to have [Docker Compose](https://docs.docker.com/compose/) installed. Bring up the `mux-server` and `mux-client` services to run the example: ```sh -docker-compose up --detach mux-server mux-client +docker compose up --detach mux-server mux-client ``` The `mux-client` service sends just one HTTP request to the `mux-server` and then exits. View the span generated by the `mux-server` in the logs: ```sh -docker-compose logs mux-server +docker compose logs mux-server ``` Shut down the services when you are finished with the example: ```sh -docker-compose down +docker compose down ``` diff --git a/examples/basic/docker-compose.yml b/examples/basic/docker-compose.yml index 4f189b5..60076f3 100644 --- a/examples/basic/docker-compose.yml +++ b/examples/basic/docker-compose.yml @@ -1,4 +1,3 @@ -version: "2.4" services: mux-client: image: curlimages/curl:7.84.0 diff --git a/examples/multi-services/Makefile b/examples/multi-services/Makefile index b90bfe8..c648e50 100644 --- a/examples/multi-services/Makefile +++ b/examples/multi-services/Makefile @@ -1,6 +1,6 @@ run: -make down - docker-compose up --build + docker compose up --build down: - docker-compose down --remove-orphans \ No newline at end of file + docker compose down --remove-orphans \ No newline at end of file diff --git a/examples/multi-services/docker-compose.yml b/examples/multi-services/docker-compose.yml index 7362f50..7cfea24 100644 --- a/examples/multi-services/docker-compose.yml +++ b/examples/multi-services/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.4' services: client: image: curlimages/curl:7.84.0