Merge remote-tracking branch 'origin/master' into cn
* origin/master: (333 commits) chore(deps): bump gunicorn in /tests/apps/dockerfile-release chore(deps): bump importlib-metadata in /docs/_build chore(deps): bump soupsieve from 4.0.1 to 4.1 in /docs/_build chore(deps): bump gunicorn from 26.2.0 to 27.0.0 in /tests/apps/multi chore(deps): bump gunicorn in /tests/apps/python-flask chore: bump pack to 0.40.11 chore(deps): bump pymdown-extensions from 12.3 to 13.0 in /docs/_build chore(deps): bump rack chore(deps): bump sass from 1.108.0 to 1.108.1 in /tests/apps/multi chore(deps): bump mkdocs-material from 9.8.0 to 9.8.1 in /docs/_build chore(deps): bump click from 8.5.0 to 8.5.1 in /docs/_build chore(deps): bump github.com/dokku/dokku-datastore in /plugins/datastore chore(deps): bump golang.org/x/sync in /plugins/common chore(deps): bump sass from 1.107.1 to 1.108.0 in /tests/apps/multi chore(deps): update markdown requirement in /docs/_build chore(deps): bump watchdog from 7.0.0 to 7.1.0 in /docs/_build chore(deps): bump soupsieve from 3.0.4 to 4.0.1 in /docs/_build chore(deps): bump traefik in /plugins/traefik-vhosts fix: build plugins/common on windows chore: bump herokuish to 0.11.25 ... # Conflicts: # common.mk # contrib/dependencies.json
This commit is contained in:
commit
bb12ba0d8b
572 files changed
+25866
-4926
No files matched your search
@@ -1,11 +1,14 @@
|
||||
GO_ARGS ?=
|
||||
GO_PLUGIN_MAKE_TARGET ?= build
|
||||
GO_REPO_ROOT := /go/src/github.com/dokku/dokku
|
||||
BUILD_IMAGE := hub.diyla.com/golang:1.26.2
|
||||
BUILD_IMAGE := hub.diyla.com/golang:1.27.1
|
||||
GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache
|
||||
GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod
|
||||
GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT)
|
||||
GOARCH ?= amd64
|
||||
ifndef TARGETARCH
|
||||
TARGETARCH := $(shell dpkg --print-architecture 2>/dev/null || uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
|
||||
endif
|
||||
GOARCH ?= $(TARGETARCH)
|
||||
|
||||
.PHONY: build-in-docker build clean src-clean
|
||||
|
||||
|
||||
Reference in new issue
Block a user