浏览代码

Merge pull request #29098 from DieterReuter/add-support-for-qemu-builds

Add support for running builds within an QEMU emulation
Sebastiaan van Stijn 8 年之前
父节点
当前提交
d80fd833e7
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      hack/make/.detect-daemon-osarch

+ 1 - 1
hack/make/.detect-daemon-osarch

@@ -19,7 +19,7 @@ docker-version-osarch() {
 }
 
 # Retrieve OS/ARCH of docker daemon, e.g. linux/amd64
-export DOCKER_ENGINE_OSARCH="$(docker-version-osarch 'Server')"
+export DOCKER_ENGINE_OSARCH="${DOCKER_ENGINE_OSARCH:=$(docker-version-osarch 'Server')}"
 export DOCKER_ENGINE_GOOS="${DOCKER_ENGINE_OSARCH%/*}"
 export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}"
 DOCKER_ENGINE_GOARCH=${DOCKER_ENGINE_GOARCH:=amd64}