From 82919ce97b57842033fafd468d6f77a3b4b88b78 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Mon, 3 Jun 2024 09:56:37 +0200
Subject: [PATCH] No more need for "GOPROXY" environment variable.

---
 .github/workflows/tarball.yml | 3 ---
 docker/proxy/Dockerfile       | 3 +--
 docker/server/Dockerfile      | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
index e38b900f..21fa40d1 100644
--- a/.github/workflows/tarball.yml
+++ b/.github/workflows/tarball.yml
@@ -77,15 +77,12 @@ jobs:
         [ -d "tmp/vendor" ] || exit 1
 
     - name: Build
-      env:
-        GOPROXY: off
       run: |
         echo "Building with $(nproc) threads"
         make -C tmp build -j$(nproc)
 
     - name: Run tests
       env:
-        GOPROXY: off
         USE_DB_IP_GEOIP_DATABASE: "1"
       run: |
         make -C tmp test TIMEOUT=120s
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index 7747edc5..c658671d 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -7,8 +7,7 @@ WORKDIR /workdir
 COPY . .
 RUN touch /.dockerenv && \
     apk add --no-cache bash git build-base protobuf && \
-    if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make proxy; else \
-    GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy; fi
+    GOOS=${TARGETOS} GOARCH=${TARGETARCH} make proxy
 
 FROM alpine:3
 
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index a70b28e3..24a2b66f 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -7,8 +7,7 @@ WORKDIR /workdir
 COPY . .
 RUN touch /.dockerenv && \
     apk add --no-cache bash git build-base protobuf && \
-    if [ -d "vendor" ]; then GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOPROXY=off make server; else \
-    GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server; fi
+    GOOS=${TARGETOS} GOARCH=${TARGETARCH} make server
 
 FROM alpine:3