2933: Update Docker to use new Python package build process.

Refs #2933.

diff --git a/docker/build_tools/Makefile b/docker/build_tools/Makefile
index 69db746326767729c5eacaa728db905400a7929a..298551fa1566b9b62ce3b588a8230e5c42cbc22b 100644 (file)
--- a/docker/build_tools/Makefile
+++ b/docker/build_tools/Makefile
@@ -89,7 +89,8 @@ $(BUILD):
        rsync -rlp --exclude=docker/ --exclude='**/log/*' --exclude='**/tmp/*' \
                --chmod=Da+rx,Fa+rX ../ build/
        find build/ -name \*.gem -delete
-       cd build/sdk/python/ && ./build.sh
+       cd build/services/fuse/ && python setup.py build
+       cd build/sdk/python/ && python setup.py build
        cd build/sdk/cli && gem build arvados-cli.gemspec
        cd build/sdk/ruby && gem build arvados.gemspec
        touch build/.buildstamp

diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 28ef858b8f3cd4bf9cfecf2d8fdc7d637f19927e..29c9d540b5f402828178586471dadd51a707a2cc 100644 (file)
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -14,6 +14,8 @@ RUN /usr/bin/apt-get install -q -y python-dev python-llfuse python-pip \
 # Install Arvados packages.
 RUN find /usr/src/arvados/sdk -name '*.gem' -print0 | \
       xargs -0rn 1 gem install && \
+    cd /usr/src/arvados/services/fuse && \
+    python setup.py install && \
     cd /usr/src/arvados/sdk/python && \
     python setup.py install