From ac9c4697710d17575c3f55b5cdedadb18361ab1c Mon Sep 17 00:00:00 2001
From: Wojtek Mach <wojtek@wojtekmach.pl>
Date: Sat, 3 Aug 2024 22:22:44 +0200
Subject: [PATCH] Update to `docker compose`

Also, set platform linux/amd64 for httpbin. It does not have arm64 image
and starting this container fails on arm64 Macs.
---
 .github/workflows/main.yml    | 2 +-
 README.md                     | 2 +-
 docker-compose.yml            | 1 +
 test/support/mint/http_bin.ex | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index eb1507b8..00ccf232 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -72,7 +72,7 @@ jobs:
         run: mix dialyzer --plt
 
       - name: Start docker
-        run: DOCKER_USER="$UID:$GID" docker-compose up --detach
+        run: DOCKER_USER="$UID:$GID" docker compose up --detach
 
       - name: Check for unused dependencies
         run: mix do deps.get, deps.unlock --check-unused
diff --git a/README.md b/README.md
index f2b1d4b5..7f5d8d86 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,7 @@ mix test --exclude requires_internet_connection
 Run all tests:
 
 ```sh
-DOCKER_USER="$UID:$GID" docker-compose up --detach # or podman-compose up --detach
+DOCKER_USER="$UID:$GID" docker compose up --detach # or podman-compose up --detach
 mix test --include proxy
 ```
 
diff --git a/docker-compose.yml b/docker-compose.yml
index dd41f374..29eddbc3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
 
   httpbin:
     image: docker.io/kennethreitz/httpbin:latest
+    platform: linux/amd64
     ports:
       - "8080:80"
 
diff --git a/test/support/mint/http_bin.ex b/test/support/mint/http_bin.ex
index 65e254e1..c8de293b 100644
--- a/test/support/mint/http_bin.ex
+++ b/test/support/mint/http_bin.ex
@@ -5,7 +5,7 @@ defmodule Mint.HttpBin do
 
   def proxy_host() do
     # the proxy runs in docker so we use the
-    # docker-compose name to connect
+    # docker compose name to connect
     "caddyhttpbin"
   end