Skip to content

Commit

Permalink
Merge pull request #82 from riandyrn/chore/use-compose-v2
Browse files Browse the repository at this point in the history
Chore: Use Docker Compose v2
  • Loading branch information
riandyrn authored Dec 7, 2024
2 parents 818d360 + e701a5c commit ac30f30
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions examples/basic/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
-make down
docker-compose up --build
docker compose up --build

down:
docker-compose down --remove-orphans
docker compose down --remove-orphans
8 changes: 4 additions & 4 deletions examples/basic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
1 change: 0 additions & 1 deletion examples/basic/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "2.4"
services:
mux-client:
image: curlimages/curl:7.84.0
Expand Down
4 changes: 2 additions & 2 deletions examples/multi-services/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
-make down
docker-compose up --build
docker compose up --build

down:
docker-compose down --remove-orphans
docker compose down --remove-orphans
1 change: 0 additions & 1 deletion examples/multi-services/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '2.4'
services:
client:
image: curlimages/curl:7.84.0
Expand Down

0 comments on commit ac30f30

Please sign in to comment.