소스 검색

Merge pull request #27421 from jcberthon/master

builder: Add AppArmor to runc buildtags for armhf - fixes #27351
Vincent Demeester 8 년 전
부모
커밋
fb65df5bfe
2개의 변경된 파일2개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      contrib/builder/deb/armhf/debian-jessie/Dockerfile
  2. 1 0
      contrib/builder/deb/armhf/raspbian-jessie/Dockerfile

+ 1 - 0
contrib/builder/deb/armhf/debian-jessie/Dockerfile

@@ -12,3 +12,4 @@ ENV PATH $PATH:/usr/local/go/bin
 
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS apparmor selinux
+ENV RUNC_BUILDTAGS apparmor selinux

+ 1 - 0
contrib/builder/deb/armhf/raspbian-jessie/Dockerfile

@@ -14,3 +14,4 @@ ENV PATH $PATH:/usr/local/go/bin
 
 ENV AUTO_GOPATH 1
 ENV DOCKER_BUILDTAGS apparmor selinux
+ENV RUNC_BUILDTAGS apparmor selinux