From 34e3f1291ccd2c64f32277efb41d06cccb8c0378 Mon Sep 17 00:00:00 2001
From: Alessio <148966056+olk-m@users.noreply.github.com>
Date: Sun, 19 Nov 2023 15:39:19 +0000
Subject: [PATCH 1/2] fix: use an unprivileged port for a server

See https://docs.docker.com/engine/security/rootless/\#networking-errors
---
 docker-compose.yml | 4 +++-
 test/conftest.py   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b169d3b5..73774493 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,9 @@ services:
     image: kennethreitz/httpbin
     container_name: httpbin
     ports:
-      - '80:80'
+      # Use an unprivileged port to support running the Docker daemon as a non-root user (Rootless mode).
+      # See https://docs.docker.com/engine/security/rootless/#networking-errors
+      - ${HTTPBIN_CUSTOM_PORT:-8080}:80
 
   httpbin-custom:
     container_name: httpbin-custom
diff --git a/test/conftest.py b/test/conftest.py
index 8f7721a8..497cb79f 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -50,7 +50,7 @@ def from_cache(*responses) -> bool:
 
 def httpbin(path: str = ''):
     """Get the url for either a local or remote httpbin instance"""
-    base_url = getenv('HTTPBIN_URL', 'http://localhost:80/')
+    base_url = getenv('HTTPBIN_URL', 'http://localhost:8080/')
     return base_url + path
 
 

From 3c8a4c04c14c5e8aaf22237c0f433c2a9e071a6d Mon Sep 17 00:00:00 2001
From: Alessio <148966056+olk-m@users.noreply.github.com>
Date: Sun, 19 Nov 2023 17:58:40 +0200
Subject: [PATCH 2/2] fix: update port for GitHub workflows

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6be25016..95f6e246 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       nginx:
         image: kennethreitz/httpbin
         ports:
-          - 80:80
+          - 8080:80
 
     steps:
       - uses: actions/checkout@v3