From d8dd372cb025730a8c894ab6eeb8efcd2cfd025a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 2 Mar 2020 17:30:12 +0800 Subject: [PATCH] build: docker: chown _output dir to current user:group --- Makefile | 2 ++ scripts/docker_push.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a980e884c..f51b89762e 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,7 @@ set -o pipefail cd /home/build/onecloud export GOFLAGS=-mod=vendor make $(1) +chown -R $(shell id -u):$(shell id -g) _output endef docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F)) @@ -230,6 +231,7 @@ set -o pipefail cd /root/go/src/yunion.io/x/onecloud export GOFLAGS=-mod=vendor make $(1) +chown -R $(shell id -u):$(shell id -g) _output endef docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F)) diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh index f17c500f7a..37e5f34268 100755 --- a/scripts/docker_push.sh +++ b/scripts/docker_push.sh @@ -43,7 +43,7 @@ build_bin() { -v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \ -v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \ registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \ - /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; make cmd/$1" + /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; make cmd/$1; chown -R $(id -u):$(id -g) _output" ;; *) GOOS=linux make cmd/$1