Docker: Remove GOPROXY and GODEBUG args from all images

2026-01-23 02:24:24 +00:00 · 2022-02-20 16:55:25 +01:00 · 2022-02-20 16:55:25 +01:00 · a9193c47a9
commit a9193c47a9
parent 3e9d758bc4
14 changed files with 0 additions and 52 deletions
--- a/1
+++ b/1
@ -1,5 +1,4 @@
 export GO111MODULE=on
-export GODEBUG=http2client=0

 GOIMPORTS=goimports
 BINARY_NAME=photoprism
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -56,7 +56,6 @@ services:
      - "traefik.http.routers.photoprism.tls.domains[0].sans=*.localssl.dev"
      - "traefik.http.routers.photoprism.tls=true"
    environment:
-      GOPROXY: "https://proxy.golang.org,direct"
      PHOTOPRISM_UID: ${UID:-1000}                   # user id, should match your host user id
      PHOTOPRISM_GID: ${GID:-1000}                   # group id
      PHOTOPRISM_ADMIN_PASSWORD: "photoprism"        # "admin" password (min 4 characters)
--- a/docker/develop/bullseye/Dockerfile
+++ b/docker/develop/bullseye/Dockerfile
@ -5,8 +5,6 @@ LABEL maintainer="Michael Mayer <hello@photoprism.app>"

 ARG TARGETARCH
 ARG BUILD_TAG
-ARG GOPROXY
-ARG GODEBUG

 # set environment variables
 ENV DOCKER_ARCH=$TARGETARCH \
--- a/docker/develop/buster/Dockerfile
+++ b/docker/develop/buster/Dockerfile
@ -5,8 +5,6 @@ LABEL maintainer="Michael Mayer <hello@photoprism.app>"

 ARG TARGETARCH
 ARG BUILD_TAG
-ARG GOPROXY
-ARG GODEBUG

 # set environment variables
 ENV DOCKER_ARCH=$TARGETARCH \
--- a/docker/develop/impish/Dockerfile
+++ b/docker/develop/impish/Dockerfile
@ -5,8 +5,6 @@ LABEL maintainer="Michael Mayer <hello@photoprism.app>"

 ARG TARGETARCH
 ARG BUILD_TAG
-ARG GOPROXY
-ARG GODEBUG

 # set environment variables
 ENV DOCKER_ARCH=$TARGETARCH \
--- a/docker/dummy/oidc/Dockerfile
+++ b/docker/dummy/oidc/Dockerfile
@ -3,9 +3,6 @@ FROM golang:1
 # Move to working directory /app
 WORKDIR /app

-ARG GOPROXY
-ARG GODEBUG
-
 # Copy files and download dependency using go mod
 COPY /docker/dummy/oidc/app/. .
 RUN go mod download
--- a/docker/dummy/webdav/Dockerfile
+++ b/docker/dummy/webdav/Dockerfile
@ -2,9 +2,6 @@ FROM golang:1

 LABEL maintainer="Michael Mayer <hello@photoprism.app>"

-ARG GOPROXY
-ARG GODEBUG
-
 # Set up project directory
 WORKDIR "/webdav"

--- a/docker/goproxy/Dockerfile
+++ b/docker/goproxy/Dockerfile
@ -1,9 +1,6 @@
 ##################################################### BUILD STAGE ######################################################
 FROM golang:alpine AS build

-ARG GOPROXY
-ARG GODEBUG
-
 RUN apk add --no-cache -U make git mercurial subversion

 RUN git clone https://github.com/goproxyio/goproxy.git /src/goproxy && \
--- a/docker/photoprism/bullseye/Dockerfile
+++ b/docker/photoprism/bullseye/Dockerfile
@ -3,8 +3,6 @@ FROM photoprism/develop:bullseye as build

 ARG TARGETARCH
 ARG BUILD_TAG
-ARG GOPROXY
-ARG GODEBUG

 # set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"
--- a/docker/photoprism/buster/Dockerfile
+++ b/docker/photoprism/buster/Dockerfile
@ -3,8 +3,6 @@ FROM photoprism/develop:buster as build

 ARG TARGETARCH
 ARG BUILD_TAG
-ARG GOPROXY
-ARG GODEBUG

 # set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"
--- a/docker/photoprism/impish/Dockerfile
+++ b/docker/photoprism/impish/Dockerfile
@ -3,8 +3,6 @@ FROM photoprism/develop:impish as build

 ARG TARGETARCH
 ARG BUILD_TAG
-ARG GOPROXY
-ARG GODEBUG

 # set up project directory
 WORKDIR "/go/src/github.com/photoprism/photoprism"
--- a/scripts/docker/build.sh
+++ b/scripts/docker/build.sh
@ -11,7 +11,6 @@ if [[ -z $1 ]] || [[ -z $2 ]]; then
 fi

 NUMERIC='^[0-9]+$'
-GOPROXY=${GOPROXY:-'https://proxy.golang.org,direct'}
 BUILD_DATE=$(date -u +%y%m%d)

 echo "Building image 'photoprism/$1' from docker/${1/-//}$3/Dockerfile...";
@ -23,8 +22,6 @@ if [[ $1 ]] && [[ -z $2 || $2 == "preview" ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -t photoprism/$1:preview \
      -f docker/${1/-//}$3/Dockerfile .
 elif [[ $2 =~ $NUMERIC ]]; then
@ -38,8 +35,6 @@ elif [[ $2 =~ $NUMERIC ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$2 \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -t photoprism/$1:latest \
      -t photoprism/$1:$2 \
      -f docker/${1/-//}$3/Dockerfile .
@ -54,8 +49,6 @@ elif [[ $2 == *"preview"* ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -t photoprism/$1:$2 \
      -f docker/${1/-//}$3/Dockerfile .
 else
@ -69,8 +62,6 @@ else
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE-$2 \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -t photoprism/$1:$2 \
      -t photoprism/$1:$BUILD_DATE-$2 \
      -f docker/${1/-//}$3/Dockerfile .
--- a/scripts/docker/buildx-multi.sh
+++ b/scripts/docker/buildx-multi.sh
@ -9,7 +9,6 @@ if [[ -z $1 ]] || [[ -z $2 ]]; then
 fi

 NUMERIC='^[0-9]+$'
-GOPROXY=${GOPROXY:-'https://proxy.golang.org,direct'}
 BUILD_DATE=$(date -u +%y%m%d)

 # kill old multi builder if still alive.
@ -33,8 +32,6 @@ if [[ $1 ]] && [[ $2 ]] && [[ -z $3 || $3 == "preview" ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:preview \
      --push .
@ -50,8 +47,6 @@ elif [[ $3 =~ $NUMERIC ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$3 \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:latest \
      -t photoprism/$1:$3 $5 \
@ -68,8 +63,6 @@ elif [[ $4 ]] && [[ $3 == *"preview"* ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:$3 $5 \
      --push .
@ -85,8 +78,6 @@ elif [[ $4 ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE-$3 \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:$3 \
      -t photoprism/$1:$BUILD_DATE-$3 $5 \
@ -99,8 +90,6 @@ else
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}/Dockerfile \
      -t photoprism/$1:$3 \
      --push .
--- a/scripts/docker/buildx.sh
+++ b/scripts/docker/buildx.sh
@ -9,7 +9,6 @@ if [[ -z $1 ]] || [[ -z $2 ]]; then
 fi

 NUMERIC='^[0-9]+$'
-GOPROXY=${GOPROXY:-'https://proxy.golang.org,direct'}
 BUILD_DATE=$(date -u +%y%m%d)

 echo "Starting 'photoprism/$1' build from docker/${1/-//}$4/Dockerfile..."
@ -23,8 +22,6 @@ if [[ $1 ]] && [[ $2 ]] && [[ -z $3 || $3 == "preview" ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:preview \
      --push .
@ -40,8 +37,6 @@ elif [[ $3 =~ $NUMERIC ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$3 \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:latest \
      -t photoprism/$1:$3 $5 \
@ -58,8 +53,6 @@ elif [[ $4 ]] && [[ $3 == *"preview"* ]]; then
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:$3 $5 \
      --push .
@ -75,8 +68,6 @@ else
      --pull \
      --no-cache \
      --build-arg BUILD_TAG=$BUILD_DATE-$3 \
-      --build-arg GOPROXY \
-      --build-arg GODEBUG \
      -f docker/${1/-//}$4/Dockerfile \
      -t photoprism/$1:$3 \
      -t photoprism/$1:$BUILD_DATE-$3 $5 \