Skip to content
Snippets Groups Projects
Commit a08c7275 authored by Gregory Ashton's avatar Gregory Ashton
Browse files

Merge branch 'change-backend-docker-images' into 'master' 

Change backend dockerfiles to v2

See merge request !669
parents 8216dbcf 1fe7c0e4
No related branches found
No related tags found
1 merge request!669Change backend dockerfiles to v2
Pipeline #91698 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 11
− 2
View file @ a08c7275
...@@ -44,10 +44,10 @@ basic-3.7: ...@@ -44,10 +44,10 @@ basic-3.7:
<<: *test-python <<: *test-python
image: python:3.7 image: python:3.7
# test example on python 3 # test example on python 3.7
python-3.7: python-3.7:
stage: test stage: test
image: bilbydev/bilby-test-suite-python37 image: bilbydev/v2-dockerfile-test-suite-python37
script: script:
- python -m pip install . - python -m pip install .
...@@ -70,6 +70,15 @@ python-3.7: ...@@ -70,6 +70,15 @@ python-3.7:
- coverage_badge.svg - coverage_badge.svg
- docs/_build/html/ - docs/_build/html/
# test example on python 3.6
python-3.6:
stage: test
image: bilbydev/v2-dockerfile-test-suite-python36
script:
- python -m pip install .
- pytest
# Tests run at a fixed schedule rather than on push # Tests run at a fixed schedule rather than on push
scheduled-python-3.7: scheduled-python-3.7:
stage: test stage: test
......
containers/v2-dockerfile-test-suite-python35
+ 3
− 3
View file @ a08c7275
...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \ ...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran 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 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
# Install conda-forge-installable programs # Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \ ...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat
containers/v2-dockerfile-test-suite-python36
+ 3
− 3
View file @ a08c7275
...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \ ...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran 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 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
# Install conda-forge-installable programs # Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \ ...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat
containers/v2-dockerfile-test-suite-python37
+ 3
− 3
View file @ a08c7275
...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \ ...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran 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 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
# Install conda-forge-installable programs # Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \ ...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat
containers/v2-dockerfile-test-suite-python38
+ 3
− 3
View file @ a08c7275
...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \ ...@@ -20,11 +20,11 @@ RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
libatlas3-base libatlas-base-dev cmake build-essential gfortran 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 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
# Install conda-forge-installable programs # Install conda-forge-installable programs
RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish
# Install pip-requirements # Install pip-requirements
RUN pip install --upgrade pip RUN pip install --upgrade pip
...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \ ...@@ -58,4 +58,4 @@ RUN mkdir roq_basis \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/B_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_linear.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/fnodes_quadratic.npy \
&& wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat \ && wget https://git.ligo.org/lscsoft/ROQ_data/raw/master/IMRPhenomPv2/4s/params.dat
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