浏览代码

Merge pull request #119 from eyakubovich/master

Include mk-docker-opts.sh in Docker container
Eugene Yakubovich 10 年之前
父节点
当前提交
c3d066fe25
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      dist/build-docker

+ 2 - 0
dist/build-docker

@@ -13,9 +13,11 @@ cat <<DF >${tgt}/Dockerfile
 FROM quay.io/coreos/flannelbox:1.0
 MAINTAINER Eugene Yakubovich <eugene.yakubovich@coreos.com>
 ADD ./flanneld /opt/bin/
+ADD ./mk-docker-opts.sh /opt/bin/
 CMD /opt/bin/flanneld
 DF
 
 cp ../bin/flanneld $tgt
+cp ../dist/mk-docker-opts.sh $tgt
 docker build -t quay.io/coreos/flannel:${tag} $tgt
 rm -rf $tgt