From bddfba63f4e92e88f2c1c116481c4980ca968018 Mon Sep 17 00:00:00 2001 From: Theodore Kisner Date: Fri, 12 Jan 2018 11:23:21 -0800 Subject: [PATCH] More fixes for moving conda install prefix inside docker. --- external/tools/Dockerfile-intel.in | 17 ++++++++--------- external/tools/Dockerfile.in | 8 +++++++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/external/tools/Dockerfile-intel.in b/external/tools/Dockerfile-intel.in index 67979f4c6..4e28b1c76 100644 --- a/external/tools/Dockerfile-intel.in +++ b/external/tools/Dockerfile-intel.in @@ -148,7 +148,13 @@ RUN rm -rf ./rules # Precompile all python modules -RUN python -m compileall -f "/usr/lib/python@PYVERSION@/site-packages" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/mpi4py" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/healpy" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/h5py" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/libsharp" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/tidas" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/pysm" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/toast" # Create a fake home directory so that packages can create # config files if needed @@ -170,14 +176,7 @@ FROM ubuntu:17.04 # Copy our installed software binaries and libraries -COPY --from=builder /usr/bin /usr/bin/ -COPY --from=builder /usr/lib /usr/lib/ - -ENV PYTHONPATH /usr/lib/python3.6/site-packages - -# Copy our conda install - -COPY --from=builder /usr/local /usr/local/ +COPY --from=builder /usr /usr/ # Copy our fake home directory diff --git a/external/tools/Dockerfile.in b/external/tools/Dockerfile.in index aed9b5db5..278839bf6 100644 --- a/external/tools/Dockerfile.in +++ b/external/tools/Dockerfile.in @@ -138,7 +138,13 @@ RUN rm -rf ./rules # Precompile all python modules -RUN python -m compileall -f "/usr/lib/python@PYVERSION@/site-packages" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/mpi4py" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/healpy" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/h5py" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/libsharp" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/tidas" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/pysm" +RUN python -m compileall -q "/usr/lib/python@PYVERSION@/site-packages/toast" # Create a fake home directory so that packages can create # config files if needed