Skip to content

Commit

Permalink
More fixes for moving conda install prefix inside docker.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tskisner
tskisner committed Jan 12, 2018
1 parent 5105830 commit bddfba6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
17 changes: 8 additions & 9 deletions external/tools/Dockerfile-intel.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion external/tools/Dockerfile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bddfba6

Please sign in to comment.