Merge pull request #3412 from thaJeztah/fix_vendor

thaJeztah · web-flow · commit 5bb88dc3c4be · 2022-01-28T17:40:36.000+01:00
Some fixes for "make vendor"
diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor
@@ -8,6 +8,7 @@ RUN apk add --no-cache bash git rsync
 WORKDIR /src
 
 FROM base AS vendored
+ENV GOPROXY=direct
 RUN --mount=target=/context \
     --mount=target=.,type=tmpfs  \
     --mount=target=/go/pkg/mod,type=cache <<EOT
diff --git a/scripts/vendor b/scripts/vendor
@@ -21,11 +21,10 @@ go 1.16
 EOL
 
 update() {
-  (set -x ; go mod vendor -modfile=vendor.mod)
+  (set -x ; go mod tidy -modfile=vendor.mod; go mod vendor -modfile=vendor.mod)
 }
 
 validate() {
-  (set -x ; go mod tidy -modfile=vendor.mod)
   diff=$(git status --porcelain -- vendor.mod vendor.sum vendor)
   if [ -n "$diff" ]; then
     echo >&2 'ERROR: Vendor result differs. Please vendor your package with "make -f docker.Makefile vendor"'
