diff --git a/Makefile b/Makefile index 10408d299..3105b4ffe 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ PROCFILE_UTIL_URL ?= $(shell jq -r --arg name procfile-util --arg arch $(TARGET SIGIL_URL ?= $(shell jq -r --arg name gliderlabs-sigil --arg arch $(TARGETARCH) '.predependencies[] | select(.name == $$name) | .urls[$$arch]' contrib/dependencies.json) SSHCOMMAND_URL ?= $(shell jq -r --arg name sshcommand --arg arch $(TARGETARCH) '.dependencies[] | select(.name == $$name) | .urls[$$arch]' contrib/dependencies.json) STACK_URL ?= https://github.com/gliderlabs/herokuish.git -PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest-24 +PREBUILT_STACK_URL ?= ccr.ccs.tencentyun.com/miaogai/herokuish:latest-24 DOKKU_LIB_ROOT ?= /var/lib/dokku PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/plugins CORE_PLUGINS_PATH ?= ${DOKKU_LIB_ROOT}/core-plugins diff --git a/common.mk b/common.mk index d6a00a5a6..b0a70e0b2 100644 --- a/common.mk +++ b/common.mk @@ -1,7 +1,7 @@ GO_ARGS ?= GO_PLUGIN_MAKE_TARGET ?= build GO_REPO_ROOT := /go/src/github.com/dokku/dokku -BUILD_IMAGE := golang:1.23.0 +BUILD_IMAGE := ccr.ccs.tencentyun.com/miaogai/golang:1.23.0 GO_BUILD_CACHE ?= /tmp/dokku-go-build-cache GO_MOD_CACHE ?= /tmp/dokku-go-mod-mod GO_ROOT_MOUNT ?= $$PWD/../..:$(GO_REPO_ROOT) @@ -19,6 +19,7 @@ build-in-docker: clean -v $(GO_MOD_CACHE):/go/pkg/mod \ -e PLUGIN_NAME=$(PLUGIN_NAME) \ -e GO111MODULE=on \ + -e GOPROXY=https://goproxy.cn,direct \ -w $(GO_REPO_ROOT)/plugins/$(PLUGIN_NAME) \ $(BUILD_IMAGE) \ bash -c "GO_ARGS='$(GO_ARGS)' CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) GOWORK=off make -j4 $(GO_PLUGIN_MAKE_TARGET)" || exit $$? diff --git a/contrib/dependencies.json b/contrib/dependencies.json index cf7baafc0..087d3f71e 100644 --- a/contrib/dependencies.json +++ b/contrib/dependencies.json @@ -4,48 +4,48 @@ "name": "docker-container-healthchecker", "version": "0.11.0", "urls": { - "amd64": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.11.0/docker-container-healthchecker-linux-amd64", - "arm64": "https://github.com/dokku/docker-container-healthchecker/releases/download/v0.11.0/docker-container-healthchecker-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-container-healthchecker-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-container-healthchecker-linux-arm64" } }, { "name": "docker-image-labeler", "version": "0.8.0", "urls": { - "amd64": "https://github.com/dokku/docker-image-labeler/releases/download/v0.8.0/docker-image-labeler-linux-amd64", - "arm64": "https://github.com/dokku/docker-image-labeler/releases/download/v0.8.0/docker-image-labeler-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-image-labeler-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/docker-image-labeler-linux-arm64" } }, { "name": "lambda-builder", "version": "0.8.0", "urls": { - "amd64": "https://github.com/dokku/lambda-builder/releases/download/v0.8.0/lambda-builder-linux-amd64", - "arm64": "https://github.com/dokku/lambda-builder/releases/download/v0.8.0/lambda-builder-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/lambda-builder-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/lambda-builder-linux-arm64" } }, { "name": "netrc", "version": "0.10.0", "urls": { - "amd64": "https://github.com/dokku/netrc/releases/download/v0.10.0/netrc-linux-amd64", - "arm64": "https://github.com/dokku/netrc/releases/download/v0.10.0/netrc-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/netrc-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/netrc-linux-arm64" } }, { "name": "procfile-util", "version": "0.19.0", "urls": { - "amd64": "https://github.com/dokku/procfile-util/releases/download/v0.19.0/procfile-util-linux-amd64", - "arm64": "https://github.com/dokku/procfile-util/releases/download/v0.19.0/procfile-util-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/procfile-util-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/procfile-util-linux-arm64" } }, { "name": "sshcommand", "version": "0.18.0", "urls": { - "amd64": "https://github.com/dokku/sshcommand/releases/download/v0.18.0/sshcommand", - "arm64": "https://github.com/dokku/sshcommand/releases/download/v0.18.0/sshcommand" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sshcommand", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sshcommand" } } ], @@ -54,16 +54,16 @@ "name": "gliderlabs-sigil", "version": "0.11.0", "urls": { - "amd64": "https://github.com/gliderlabs/sigil/releases/download/v0.11.0/sigil-linux-amd64", - "arm64": "https://github.com/gliderlabs/sigil/releases/download/v0.11.0/sigil-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sigil-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/sigil-linux-arm64" } }, { "name": "plugn", "version": "0.15.3", "urls": { - "amd64": "https://github.com/dokku/plugn/releases/download/v0.15.3/plugn-linux-amd64", - "arm64": "https://github.com/dokku/plugn/releases/download/v0.15.3/plugn-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/plugn-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/plugn-linux-arm64" } } ], @@ -72,24 +72,24 @@ "name": "dokku-event-listener", "version": "0.17.0", "urls": { - "amd64": "https://github.com/dokku/dokku-event-listener/releases/download/v0.17.0/dokku-event-listener-linux-amd64", - "arm64": "https://github.com/dokku/dokku-event-listener/releases/download/v0.17.0/dokku-event-listener-linux-arm64" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-event-listener-linux-amd64", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-event-listener-linux-arm64" } }, { "name": "dokku-update", "version": "0.9.4", "urls": { - "amd64": "https://github.com/dokku/dokku-update/releases/download/v0.9.4/dokku-update", - "arm64": "https://github.com/dokku/dokku-update/releases/download/v0.9.4/dokku-update" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-update", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/dokku-update" } }, { "name": "herokuish", "version": "0.10.2", "urls": { - "amd64": "https://github.com/gliderlabs/herokuish/releases/download/v0.10.2/herokuish_0.10.2_linux_x86_64.tgz", - "arm64": "https://github.com/gliderlabs/herokuish/releases/download/v0.10.2/herokuish_0.10.2_linux_x86_64.tgz" + "amd64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/herokuish_0.10.2_linux_x86_64.tgz", + "arm64": "https://hotfix-1256173281.cos.ap-shanghai.myqcloud.com/download/dokku/herokuish_0.10.2_linux_x86_64.tgz" } } ] diff --git a/dokku b/dokku index cd8a381a4..58e7aba16 100755 --- a/dokku +++ b/dokku @@ -39,8 +39,8 @@ DOKKU_DISTRO=$( # configuration can ever override the DOCKER_BIN value export DOCKER_BIN=${DOCKER_BIN:="docker"} -export DOKKU_IMAGE=${DOKKU_IMAGE:="gliderlabs/herokuish:latest-24"} -export DOKKU_CNB_BUILDER=${DOKKU_CNB_BUILDER:="heroku/builder:24"} +export DOKKU_IMAGE=${DOKKU_IMAGE:="ccr.ccs.tencentyun.com/miaogai/herokuish:latest-24"} +export DOKKU_CNB_BUILDER=${DOKKU_CNB_BUILDER:="ccr.ccs.tencentyun.com/miaogai/heroku:builder24"} export DOKKU_LIB_ROOT=${DOKKU_LIB_PATH:="/var/lib/dokku"} export PLUGIN_PATH=${PLUGIN_PATH:="$DOKKU_LIB_ROOT/plugins"}