Remove setting GO111MODULE=on

nginx · May 6, 2021 · 493f328 · 493f328
1 parent 8e98ee4
commit 493f328
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,5 +1,3 @@
-env:
-  - GO111MODULE=on
 before:
   hooks:
     - make clean

diff --git a/Makefile b/Makefile
@@ -12,15 +12,15 @@ export DOCKER_BUILDKIT = 1
 
 .PHONY: nginx-prometheus-exporter
 nginx-prometheus-exporter:
-	GO111MODULE=on CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$(VERSION) -X main.commit=$(GIT_COMMIT) -X main.date=$(DATE)" -o nginx-prometheus-exporter
+	CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$(VERSION) -X main.commit=$(GIT_COMMIT) -X main.date=$(DATE)" -o nginx-prometheus-exporter
 
 .PHONY: lint
 lint:
 	go run github.com/golangci/golangci-lint/cmd/golangci-lint run
 
 .PHONY: test
 test:
-	GO111MODULE=on go test ./...
+	go test ./...
 
 .PHONY: container
 container:

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -12,7 +12,7 @@ RUN go mod download
 COPY *.go ./
 COPY collector ./collector
 COPY client ./client
-RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o nginx-prometheus-exporter .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -trimpath -a -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${GIT_COMMIT} -X main.date=${DATE}" -o nginx-prometheus-exporter .
 
 
 FROM scratch as intermediate