From 2fef03374b4550fea1e805305ab31dbd2179e753 Mon Sep 17 00:00:00 2001
From: "Begley Brothers (Development)"
 <60454087+bbros-dev@users.noreply.github.com>
Date: Mon, 19 Oct 2020 15:31:21 +1100
Subject: [PATCH 1/2] Dockerfile: Support socat use cases

In some contexts it is necessary to provide access to Gitea via TCP ports and unix sockets.
Gitea (`gitea web`) can be configured to listen for connections via unix-socket or TCP port, but not both.
When Gitea is installed to the host this limitation can be worked around by installing socat on the host.
When running Gitea from a container this limitation cannot be workaround.

Add socat to Gitea container.
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 8800738bdee14..5ee48f62de500 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,6 +37,7 @@ RUN apk --no-cache add \
     openssh \
     s6 \
     sqlite \
+    socat=1.7.3.2 \
     su-exec \
     gnupg
 

From 32bd44d811340c1d708b66eae9740543cb606b24 Mon Sep 17 00:00:00 2001
From: "Begley Brothers (Development)"
 <60454087+bbros-dev@users.noreply.github.com>
Date: Mon, 19 Oct 2020 21:38:18 +1100
Subject: [PATCH 2/2] Removed version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5ee48f62de500..efa7dfbabc762 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN apk --no-cache add \
     openssh \
     s6 \
     sqlite \
-    socat=1.7.3.2 \
+    socat \
     su-exec \
     gnupg