No more need for "GOPROXY" environment variable.

strukturag · Jun 3, 2024 · 82919ce · 82919ce
1 parent 26e3a39
commit 82919ce
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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