commit 47c6e26275a49552496e86e718ef0cf019690591
author Charles Chan <rascov@gmail.com> Wed Oct 04 11:24:33 2017 -0700
committer Charles Chan <rascov@gmail.com> Wed Oct 04 13:36:48 2017 -0700
tree 85e5a9351f6eeb0d3024f5653537d68bf3a5f129
parent 3d26bf0e5ee86ba7320d94648b05783d97baef70

Fix dependency and permission issue in docker build

Change-Id: Ie0263b2ba6d98f5ca2bc63029987e7ad3e84fd6c

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index bf7f9bf..51b1a58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@
 # FIXME - dependence on ONOS_ROOT and git at build time is a hack to work around
 # build problems
 WORKDIR /src/onos
-RUN apt-get update && apt-get install -y zip python git && \
+RUN apt-get update && apt-get install -y zip python git bzip2 && \
         export ONOS_ROOT=/src/onos && \
         tools/build/onos-buck build onos && \
         mkdir -p /src/tar && \

bucklets/node.bucklet

diff --git a/bucklets/node.bucklet b/bucklets/node.bucklet
index 3239e46..c5cc14a 100644
--- a/bucklets/node.bucklet
+++ b/bucklets/node.bucklet
@@ -25,7 +25,7 @@
 
     genrule(
         name = 'node-bin-' + version,
-        bash = 'tar -xf $(location :node-release-' + version + ') && ' +
+        bash = 'tar --no-same-owner -xf $(location :node-release-' + version + ') && ' +
                'mv ' + file_name + ' $OUT && ' +
                'chmod +x $OUT',
         out = 'node-binaries',