fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: docker-centos-build: use centos-build:1.1-1

Browse Source
This commit is contained in:
Yousong Zhou
2020-06-29 15:09:58 +08:00
parent 8e9c587992
commit e1e56eaa7d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -199,7 +199,7 @@ mod:
go mod vendor -v
DOCKER_BUILD_IMAGE_VERSION?=1.0-1
DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-1
define dockerCentOSBuildCmd
set -o xtrace
@@ -215,11 +215,11 @@ docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(
docker-centos-build:
docker rm --force onecloud-ci-build &>/dev/null || true
docker run \
--name onecloud-ci-build \
--name onecloud-docker-centos-build \
--rm \
--volume $(CURDIR):/root/onecloud \
--volume $(CURDIR)/_output/_cache:/root/.cache \
registry.cn-beijing.aliyuncs.com/yunionio/centos-build:$(DOCKER_BUILD_IMAGE_VERSION) \
$(DOCKER_CENTOS_BUILD_IMAGE) \
/bin/bash -c "$$dockerCentOSBuildCmd"
chown -R $$(id -u):$$(id -g) _output
ls -lh _output/bin
@@ -227,7 +227,7 @@ docker-centos-build:
# NOTE we need a way to stop and remove the container started by docker-build.
# No --tty, --stop-signal won't work
docker-centos-build-stop:
docker-centos stop --time 0 onecloud-ci-build || true
docker stop --time 0 onecloud-docker-centos-build || true
.PHONY: docker-centos-build
.PHONY: docker-centos-build-stop