Commit 946afe7b authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Adapted docker installer to new external base image.

parent 707d25b7
Pipeline #1560 passed with stages
in 2 minutes and 39 seconds
......@@ -19,8 +19,8 @@ stages:
test_arosics:
stage: test
script:
- source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal
- source /root/miniconda3/bin/activate
- export GDAL_DATA=/root/miniconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- make nosetests
- make docs
......@@ -36,8 +36,8 @@ test_arosics:
test_styles:
stage: test
script:
- source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal
- source /root/miniconda3/bin/activate
- export GDAL_DATA=/root/miniconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- make lint
artifacts:
......@@ -51,8 +51,8 @@ test_styles:
test_arosics_install:
stage: test
script:
- source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal
- source /root/miniconda3/bin/activate
- export GDAL_DATA=/root/miniconda3/share/gdal
- conda create -y -q --name arosics python=3
- source activate arosics
# resolve some requirements with conda
......@@ -106,7 +106,7 @@ deploy_pypi:
dependencies:
- test_arosics
script: # Configure the PyPI credentials, then push the package, and cleanup the creds.
- source /root/anaconda3/bin/activate
- source /root/miniconda3/bin/activate
- mkdir -p public/images/
- cp -r docs/images/* public/images/
- printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc
......
FROM conda_pyenv:pinned_v0.1
FROM gms_base_centos:pinned_v0.1
# copy some needed stuff to /root
COPY *.yml /root/
RUN /bin/bash -i -c "\
source /root/miniconda3/bin/activate ; \
source activate py3; \
conda env update -f /root/environment_arosics.yml"
conda env update -n root -f /root/environment_arosics.yml"
Markdown is supported
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