diff --git a/Dockerfile b/Dockerfile index dc2dcd6a..d35473ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,89 +1,4 @@ -# sodetlib dockerfile. -FROM tidair/pysmurf-client:v7.1.0 - -################################################################# -# SPT3G Install -################################################################# -WORKDIR /usr/local/src/ - -ENV TZ=Etc/UTC -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -RUN apt-get update - -RUN apt-get install -y \ - libboost-all-dev \ - libflac-dev \ - libnetcdf-dev \ - libfftw3-dev \ - libgsl0-dev \ - tcl \ - environment-modules \ - gdb \ - rsync \ - cmake \ - libblas-dev \ - # so3g reqs - automake \ - gfortran \ - build-essential \ - libbz2-dev \ - libopenblas-dev \ - && rm -rf /var/lib/apt/lists/* - -RUN git clone https://github.com/CMB-S4/spt3g_software.git && cd spt3g_software && git checkout 5f30121395129de9c9a6af2976de8ba8e876b5a8 -RUN cd spt3g_software \ - && mkdir -p build \ - && cd build \ - && cmake .. -DPYTHON_EXECUTABLE=`which python3` \ - && make core version - -ENV SPT3G_SOFTWARE_PATH /usr/local/src/spt3g_software -ENV SPT3G_SOFTWARE_BUILD_PATH /usr/local/src/spt3g_software/build -ENV PYTHONPATH /usr/local/src/spt3g_software/build:${PYTHONPATH} - -################################################################# -# SO3G Install -################################################################# -WORKDIR /usr/local/src -ENV LANG C.UTF-8 - -RUN git clone https://github.com/simonsobs/so3g.git -WORKDIR /usr/local/src/so3g -RUN pip3 install -r requirements.txt - -ENV Spt3g_DIR /usr/local/src/spt3g_software -# Install qpoint -RUN /bin/bash /usr/local/src/so3g/docker/qpoint-setup.sh - -# Build so3g -RUN mkdir build \ - && cd build \ - && cmake .. -DCMAKE_PREFIX_PATH=$SPT3G_SOFTWARE_BUILD_PATH \ - && make \ - && make install - -################################################################# -# SOTODLIB Install -################################################################# -WORKDIR /usr/local/src - -# Freeze sotodlib before so3g was added as requirement -RUN git clone https://github.com/simonsobs/sotodlib.git && cd sotodlib && git checkout e37d2c0b342f609cf640ee79541c98f7a2d7485a -RUN pip3 install quaternionarray sqlalchemy -RUN pip3 install ./sotodlib - -################################################################# -# OCS Install -################################################################# -RUN git clone --branch py36 https://github.com/simonsobs/ocs.git - -RUN pip3 install cryptography==3.3.2 -# RUN pip3 install -r ocs/requirements.txt -RUN pip3 install ./ocs - -# Sets ocs configuration environment -ENV OCS_CONFIG_DIR=/config +FROM simonsobs/so_smurf_base:v0.0.2 ################################################################# # sodetlib Install @@ -91,7 +6,4 @@ ENV OCS_CONFIG_DIR=/config COPY . /sodetlib WORKDIR /sodetlib RUN pip3 install -e . -RUN pip3 install -r requirements.txt - -# This is to get the leap-second download out of the way -RUN python3 -c "import so3g" +RUN pip3 install -r requirements.txt \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2f3ec8d6..366b29e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,5 @@ scipy matplotlib lmfit pyfftw +pandas +seaborn