diff --git a/Dockerfile b/Dockerfile index e44354e..e45d078 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,11 @@ ARG VERSION=dev RUN TEFTER_VERSION=$VERSION npx vite build FROM docker.io/library/golang:1.25-alpine AS build +# Overridable for hosts where proxy.golang.org (Google) is unreachable — +# set e.g. GOPROXY=https://goproxy.io,direct in .env.docker. Module +# integrity is still verified against the committed go.sum either way. +ARG GOPROXY=https://proxy.golang.org,direct +ENV GOPROXY=$GOPROXY WORKDIR /src/server COPY server/go.mod server/go.sum ./ RUN go mod download diff --git a/deploy/redeploy-tefter.sh b/deploy/redeploy-tefter.sh index f04e5ad..c4ceecb 100755 --- a/deploy/redeploy-tefter.sh +++ b/deploy/redeploy-tefter.sh @@ -6,8 +6,10 @@ SERVICE=tefter.service cd "$APP_DIR" -# Port the app is published on (kept in .env.docker next to the compose file). -WEB_PORT=$(grep -oP '^WEB_PORT=\K.*' .env.docker 2>/dev/null || echo 8420) +# Host-specific settings (WEB_PORT, GOPROXY, ...) live in .env.docker next to +# the compose file; export them so compose interpolation sees them. +set -a; [ -f .env.docker ] && . ./.env.docker; set +a +WEB_PORT=${WEB_PORT:-8420} echo "==> Pulling latest code..." git pull diff --git a/docker-compose.yml b/docker-compose.yml index 8a5d649..3069d9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: context: . args: VERSION: ${TEFTER_VERSION:-dev} + GOPROXY: ${GOPROXY:-https://proxy.golang.org,direct} environment: TEFTER_DB: /data/tefter.db volumes: