浏览代码

build runc with runc_nodmz

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 年之前
父节点
当前提交
b91f320c77
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      Dockerfile
  2. 1 1
      hack/dockerfile/install/runc.installer

+ 1 - 1
Dockerfile

@@ -306,7 +306,7 @@ RUN --mount=from=runc-src,src=/usr/src/runc,rw \
     --mount=type=cache,target=/root/.cache/go-build,id=runc-build-$TARGETPLATFORM <<EOT
   set -e
   xx-go --wrap
-  CGO_ENABLED=1 make "$([ "$DOCKER_STATIC" = "1" ] && echo "static" || echo "runc")"
+  CGO_ENABLED=1 make BUILDTAGS="secccomp runc_nodmz" "$([ "$DOCKER_STATIC" = "1" ] && echo "static" || echo "runc")"
   xx-verify $([ "$DOCKER_STATIC" = "1" ] && echo "--static") runc
   mkdir /build
   mv runc /build/

+ 1 - 1
hack/dockerfile/install/runc.installer

@@ -12,7 +12,7 @@ set -e
 : "${RUNC_VERSION:=v1.2.0-rc.1}"
 
 install_runc() {
-	RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp"}"
+	RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp runc_nodmz"}"
 
 	echo "Install runc version $RUNC_VERSION (build tags: $RUNC_BUILDTAGS)"
 	git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc"