Merge current v2.11 into v3.4
This commit is contained in:
commit
9ee0e43eac
1 changed files with 2 additions and 1 deletions
3
Makefile
3
Makefile
|
@ -13,6 +13,7 @@ DATE := $(shell date -u '+%Y-%m-%d_%I:%M:%S%p')
|
||||||
# Default build target
|
# Default build target
|
||||||
GOOS := $(shell go env GOOS)
|
GOOS := $(shell go env GOOS)
|
||||||
GOARCH := $(shell go env GOARCH)
|
GOARCH := $(shell go env GOARCH)
|
||||||
|
GOGC ?=
|
||||||
|
|
||||||
LINT_EXECUTABLES = misspell shellcheck
|
LINT_EXECUTABLES = misspell shellcheck
|
||||||
|
|
||||||
|
@ -56,7 +57,7 @@ generate:
|
||||||
#? binary: Build the binary
|
#? binary: Build the binary
|
||||||
binary: generate-webui dist
|
binary: generate-webui dist
|
||||||
@echo SHA: $(VERSION) $(CODENAME) $(DATE)
|
@echo SHA: $(VERSION) $(CODENAME) $(DATE)
|
||||||
CGO_ENABLED=0 GOGC=off GOOS=${GOOS} GOARCH=${GOARCH} go build ${FLAGS[*]} -ldflags "-s -w \
|
CGO_ENABLED=0 GOGC=${GOGC} GOOS=${GOOS} GOARCH=${GOARCH} go build ${FLAGS[*]} -ldflags "-s -w \
|
||||||
-X github.com/traefik/traefik/v3/pkg/version.Version=$(VERSION) \
|
-X github.com/traefik/traefik/v3/pkg/version.Version=$(VERSION) \
|
||||||
-X github.com/traefik/traefik/v3/pkg/version.Codename=$(CODENAME) \
|
-X github.com/traefik/traefik/v3/pkg/version.Codename=$(CODENAME) \
|
||||||
-X github.com/traefik/traefik/v3/pkg/version.BuildDate=$(DATE)" \
|
-X github.com/traefik/traefik/v3/pkg/version.BuildDate=$(DATE)" \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue