Merge pull request #1235 from vvoland/gomodules

vvoland · web-flow · commit 10f5969ab963 · 2025-08-05T12:12:32.000Z
Use Go modules
diff --git a/deb/common/rules b/deb/common/rules
@@ -20,9 +20,12 @@ export PKG_REVISION
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+# Determine the Go module mode based on the presence of vendor.mod or go.mod
+override_dh_auto_build: GOMOD := $(if $(wildcard engine/vendor.mod),off,$(if $(wildcard engine/go.mod),on,$(error "No go.mod or vendor.mod found in engine directory")))
+# Override the default dh_auto_build target
 override_dh_auto_build:
 	# Build the daemon and dependencies
-	cd engine && DOCKER_GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary
+	cd engine && GO111MODULE=$(GOMOD) DOCKER_GITCOMMIT=$(ENGINE_GITCOMMIT) PRODUCT=docker ./hack/make.sh dynbinary
 	cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
 	cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh rootlesskit dynamic
 
diff --git a/deb/debian-bookworm/Dockerfile b/deb/debian-bookworm/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/debian-bullseye/Dockerfile b/deb/debian-bullseye/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/debian-trixie/Dockerfile b/deb/debian-trixie/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/raspbian-bookworm/Dockerfile b/deb/raspbian-bookworm/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/raspbian-bullseye/Dockerfile b/deb/raspbian-bullseye/Dockerfile
@@ -14,7 +14,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/ubuntu-jammy/Dockerfile b/deb/ubuntu-jammy/Dockerfile
@@ -20,7 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/ubuntu-noble/Dockerfile b/deb/ubuntu-noble/Dockerfile
@@ -20,7 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/ubuntu-oracular/Dockerfile b/deb/ubuntu-oracular/Dockerfile
@@ -20,7 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/deb/ubuntu-plucky/Dockerfile b/deb/ubuntu-plucky/Dockerfile
@@ -20,7 +20,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y curl devscripts equivs git
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec
@@ -68,7 +68,17 @@ ln -snf ${RPM_BUILD_DIR}/src/engine /go/src/github.com/docker/docker
 
 pushd ${RPM_BUILD_DIR}/src/engine
 TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
-VERSION=%{_origversion} PRODUCT=docker hack/make.sh dynbinary
+
+# Determine Go module mode based on file presence
+if [ -f vendor.mod ]; then
+    GOMOD=off
+elif [ -f go.mod ]; then
+    GOMOD=on
+else
+    echo "No go.mod or vendor.mod found in engine directory"
+    exit 1
+fi
+GO111MODULE=$GOMOD VERSION=%{_origversion} PRODUCT=docker hack/make.sh dynbinary
 popd
 
 #  build  man-pages
diff --git a/rpm/centos-10/Dockerfile b/rpm/centos-10/Dockerfile
@@ -9,7 +9,7 @@ FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/rpm/centos-9/Dockerfile b/rpm/centos-9/Dockerfile
@@ -9,7 +9,7 @@ FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/rpm/fedora-41/Dockerfile b/rpm/fedora-41/Dockerfile
@@ -9,7 +9,7 @@ FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/rpm/fedora-42/Dockerfile b/rpm/fedora-42/Dockerfile
@@ -9,7 +9,7 @@ FROM ${GO_IMAGE} AS golang
 
 FROM ${BUILD_IMAGE}
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/rpm/rhel-8/Dockerfile b/rpm/rhel-8/Dockerfile
@@ -26,7 +26,7 @@ EOT
 FROM subscribed-image
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
diff --git a/rpm/rhel-9/Dockerfile b/rpm/rhel-9/Dockerfile
@@ -26,7 +26,7 @@ EOT
 FROM subscribed-image
 
 ENV GOPROXY=https://proxy.golang.org|direct
-ENV GO111MODULE=off
+ENV GO111MODULE=on
 ENV GOPATH=/go
 ENV GOTOOLCHAIN=local
 ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
