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,6 +1,6 @@
|
||||
DOKKU_VERSION ?= master
|
||||
|
||||
TARGETARCH ?= amd64
|
||||
include common.mk
|
||||
|
||||
DOCKER_IMAGE_LABELER_URL ?= $(shell jq -r --arg name docker-image-labeler --arg arch $(TARGETARCH) '.dependencies[] | select(.name == $$name) | .urls[$$arch]' contrib/dependencies.json)
|
||||
DOCKER_CONTAINER_HEALTHCHECKER_URL ?= $(shell jq -r --arg name docker-container-healthchecker --arg arch $(TARGETARCH) '.dependencies[] | select(.name == $$name) | .urls[$$arch]' contrib/dependencies.json)
|
||||
@@ -31,9 +31,7 @@ else
|
||||
BUILD_STACK_TARGETS = build-in-docker
|
||||
endif
|
||||
|
||||
include common.mk
|
||||
|
||||
.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies docker-image-labeler lambda-builder netrc sshcommand procfile-util plugn docker aufs stack count vagrant-acl-add vagrant-dokku go-build
|
||||
.PHONY: all apt-update install version copyfiles copyplugin man-db plugins dependencies docker-image-labeler lambda-builder netrc sshcommand procfile-util plugn docker aufs stack count vagrant-acl-add vagrant-dokku go-build wget
|
||||
|
||||
include docs.mk
|
||||
include tests.mk
|
||||
@@ -126,17 +124,20 @@ else
|
||||
endif
|
||||
|
||||
plugin-dependencies: plugn procfile-util
|
||||
sudo -E dokku plugin:install-dependencies --core
|
||||
sudo dokku plugin:install-dependencies --core
|
||||
|
||||
plugins: plugn procfile-util docker
|
||||
sudo -E dokku plugin:install --core
|
||||
sudo dokku plugin:install --core
|
||||
|
||||
dependencies: apt-update jq docker-image-labeler docker-container-healthchecker lambda-builder netrc sshcommand plugn procfile-util docker help2man man-db sigil dos2unix parallel
|
||||
dependencies: apt-update wget jq docker-image-labeler docker-container-healthchecker lambda-builder netrc sshcommand plugn procfile-util docker help2man man-db sigil dos2unix parallel
|
||||
$(MAKE) -e stack
|
||||
|
||||
apt-update:
|
||||
apt-get update -qq
|
||||
|
||||
wget:
|
||||
apt-get -qq -y --no-install-recommends install wget
|
||||
|
||||
parallel:
|
||||
apt-get -qq -y --no-install-recommends install parallel
|
||||
|
||||
@@ -152,7 +153,7 @@ help2man:
|
||||
man-db:
|
||||
apt-get -qq -y --no-install-recommends install man-db
|
||||
|
||||
docker-image-labeler:
|
||||
docker-image-labeler: wget
|
||||
wget -qO /usr/local/bin/docker-image-labeler ${DOCKER_IMAGE_LABELER_URL}
|
||||
chmod +x /usr/local/bin/docker-image-labeler
|
||||
|
||||
|
||||
Reference in new issue
Block a user