Skip to content
Snippets Groups Projects
Commit cc9a73fd authored by Colm Talbot's avatar Colm Talbot
Browse files

Merge branch 'fix-docker-bubild' into 'master' 

Fix docker build

See merge request !1044
parents 374ea0f8 d7eb4466
No related branches found
No related tags found
1 merge request!1044Fix docker build
Pipeline #340222 failed
Stage: initial
Stage: test
Stage: docs
Stage: deploy
Hide whitespace changes
Inline Side-by-side
containers/dockerfile-template
+ 18
− 11
View file @ cc9a73fd
...@@ -13,31 +13,34 @@ RUN /bin/bash -c "source activate ${{conda_env}}" ...@@ -13,31 +13,34 @@ RUN /bin/bash -c "source activate ${{conda_env}}"
RUN conda info RUN conda info
RUN python --version RUN python --version
# Install pymultinest requirements
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran
# Install conda-installable programs # Install conda-installable programs
RUN conda install -n ${{conda_env}} -y matplotlib numpy scipy pandas astropy flake8 mock RUN conda install -n ${{conda_env}} -y matplotlib numpy scipy pandas astropy flake8 mock
RUN conda install -n ${{conda_env}} -c anaconda coverage configargparse future RUN conda install -n ${{conda_env}} -c anaconda coverage configargparse future
RUN conda install -n ${{conda_env}} -c conda-forge black pytest-cov deepdish arviz
# Install conda-forge-installable programs
RUN conda install -n ${{conda_env}} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install --upgrade setuptools coverage-badge RUN pip install --upgrade setuptools coverage-badge parameterized
# Install documentation requirements # Install documentation requirements
RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
# Install dependencies and samplers # Install dependencies and samplers
RUN pip install corner lalsuite theano healpy cython tables RUN pip install corner theano healpy cython tables
RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc RUN conda install -n ${{conda_env}} -c conda-forge dynesty emcee nestle ptemcee
RUN conda install -n ${{conda_env}} -c conda-forge pymultinest ultranest RUN conda install -n ${{conda_env}} -c conda-forge pymultinest ultranest
RUN conda install -n ${{conda_env}} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
RUN conda install -n ${{conda_env}} -c conda-forge pytorch
RUN pip install nessai
# Install Polychord # Install Polychord
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y build-essential
RUN apt-get install -y libblas3 libblas-dev
RUN apt-get install -y liblapack3 liblapack-dev
RUN apt-get install -y libatlas3-base libatlas-base-dev
RUN apt-get install -y gfortran
RUN git clone https://github.com/PolyChord/PolyChordLite.git \ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
&& (cd PolyChordLite && python setup.py --no-mpi install) && (cd PolyChordLite && python setup.py --no-mpi install)
...@@ -45,6 +48,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \ ...@@ -45,6 +48,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
&& (cd PTMCMCSampler && python setup.py install) && (cd PTMCMCSampler && python setup.py install)
# Install GW packages
RUN conda install -n ${{conda_env}} -c conda-forge python-lalsimulation
RUN pip install ligo-gracedb gwpy ligo.skymap
# Add the ROQ data to the image # Add the ROQ data to the image
RUN mkdir roq_basis \ RUN mkdir roq_basis \
&& cd roq_basis \ && cd roq_basis \
......
containers/v3-dockerfile-test-suite-python37
+ 18
− 11
View file @ cc9a73fd
...@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}" ...@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}"
RUN conda info RUN conda info
RUN python --version RUN python --version
# Install pymultinest requirements
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran
# Install conda-installable programs # Install conda-installable programs
RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock
RUN conda install -n ${conda_env} -c anaconda coverage configargparse future RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
RUN conda install -n ${conda_env} -c conda-forge black pytest-cov deepdish arviz
# Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install --upgrade setuptools coverage-badge RUN pip install --upgrade setuptools coverage-badge parameterized
# Install documentation requirements # Install documentation requirements
RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
# Install dependencies and samplers # Install dependencies and samplers
RUN pip install corner lalsuite theano healpy cython tables RUN pip install corner theano healpy cython tables
RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc RUN conda install -n ${conda_env} -c conda-forge dynesty emcee nestle ptemcee
RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest
RUN conda install -n ${conda_env} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
RUN conda install -n ${conda_env} -c conda-forge pytorch
RUN pip install nessai
# Install Polychord # Install Polychord
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y build-essential
RUN apt-get install -y libblas3 libblas-dev
RUN apt-get install -y liblapack3 liblapack-dev
RUN apt-get install -y libatlas3-base libatlas-base-dev
RUN apt-get install -y gfortran
RUN git clone https://github.com/PolyChord/PolyChordLite.git \ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
&& (cd PolyChordLite && python setup.py --no-mpi install) && (cd PolyChordLite && python setup.py --no-mpi install)
...@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \ ...@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
&& (cd PTMCMCSampler && python setup.py install) && (cd PTMCMCSampler && python setup.py install)
# Install GW packages
RUN conda install -n ${conda_env} -c conda-forge python-lalsimulation
RUN pip install ligo-gracedb gwpy ligo.skymap
# Add the ROQ data to the image # Add the ROQ data to the image
RUN mkdir roq_basis \ RUN mkdir roq_basis \
&& cd roq_basis \ && cd roq_basis \
......
containers/v3-dockerfile-test-suite-python38
+ 18
− 11
View file @ cc9a73fd
...@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}" ...@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}"
RUN conda info RUN conda info
RUN python --version RUN python --version
# Install pymultinest requirements
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran
# Install conda-installable programs # Install conda-installable programs
RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock
RUN conda install -n ${conda_env} -c anaconda coverage configargparse future RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
RUN conda install -n ${conda_env} -c conda-forge black pytest-cov deepdish arviz
# Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install --upgrade setuptools coverage-badge RUN pip install --upgrade setuptools coverage-badge parameterized
# Install documentation requirements # Install documentation requirements
RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
# Install dependencies and samplers # Install dependencies and samplers
RUN pip install corner lalsuite theano healpy cython tables RUN pip install corner theano healpy cython tables
RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc RUN conda install -n ${conda_env} -c conda-forge dynesty emcee nestle ptemcee
RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest
RUN conda install -n ${conda_env} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
RUN conda install -n ${conda_env} -c conda-forge pytorch
RUN pip install nessai
# Install Polychord # Install Polychord
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y build-essential
RUN apt-get install -y libblas3 libblas-dev
RUN apt-get install -y liblapack3 liblapack-dev
RUN apt-get install -y libatlas3-base libatlas-base-dev
RUN apt-get install -y gfortran
RUN git clone https://github.com/PolyChord/PolyChordLite.git \ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
&& (cd PolyChordLite && python setup.py --no-mpi install) && (cd PolyChordLite && python setup.py --no-mpi install)
...@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \ ...@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
&& (cd PTMCMCSampler && python setup.py install) && (cd PTMCMCSampler && python setup.py install)
# Install GW packages
RUN conda install -n ${conda_env} -c conda-forge python-lalsimulation
RUN pip install ligo-gracedb gwpy ligo.skymap
# Add the ROQ data to the image # Add the ROQ data to the image
RUN mkdir roq_basis \ RUN mkdir roq_basis \
&& cd roq_basis \ && cd roq_basis \
......
containers/v3-dockerfile-test-suite-python39
+ 18
− 11
View file @ cc9a73fd
...@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}" ...@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}"
RUN conda info RUN conda info
RUN python --version RUN python --version
# Install pymultinest requirements
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran
# Install conda-installable programs # Install conda-installable programs
RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock
RUN conda install -n ${conda_env} -c anaconda coverage configargparse future RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
RUN conda install -n ${conda_env} -c conda-forge black pytest-cov deepdish arviz
# Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install --upgrade setuptools coverage-badge RUN pip install --upgrade setuptools coverage-badge parameterized
# Install documentation requirements # Install documentation requirements
RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
# Install dependencies and samplers # Install dependencies and samplers
RUN pip install corner lalsuite theano healpy cython tables RUN pip install corner theano healpy cython tables
RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc RUN conda install -n ${conda_env} -c conda-forge dynesty emcee nestle ptemcee
RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest
RUN conda install -n ${conda_env} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
RUN conda install -n ${conda_env} -c conda-forge pytorch
RUN pip install nessai
# Install Polychord # Install Polychord
RUN apt-get update --allow-releaseinfo-change
RUN apt-get install -y build-essential
RUN apt-get install -y libblas3 libblas-dev
RUN apt-get install -y liblapack3 liblapack-dev
RUN apt-get install -y libatlas3-base libatlas-base-dev
RUN apt-get install -y gfortran
RUN git clone https://github.com/PolyChord/PolyChordLite.git \ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
&& (cd PolyChordLite && python setup.py --no-mpi install) && (cd PolyChordLite && python setup.py --no-mpi install)
...@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \ ...@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
RUN git clone https://github.com/jellis18/PTMCMCSampler.git \ RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
&& (cd PTMCMCSampler && python setup.py install) && (cd PTMCMCSampler && python setup.py install)
# Install GW packages
RUN conda install -n ${conda_env} -c conda-forge python-lalsimulation
RUN pip install ligo-gracedb gwpy ligo.skymap
# Add the ROQ data to the image # Add the ROQ data to the image
RUN mkdir roq_basis \ RUN mkdir roq_basis \
&& cd roq_basis \ && cd roq_basis \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment