arosics_ci.docker now inherits from ci_base_centos:0.1. Conda update now uses conda-forge channel.

Signed-off-by: Daniel Scheffler <danschef@gfz-potsdam.de>

.gitlab-ci.yml

@@ -52,7 +52,7 @@ test_arosics_install:
     - source /root/miniconda3/bin/activate
 
     # update conda and python
-    - conda update -n base -c defaults conda
+    - conda update -n base -c conda-forge conda
     # - conda update -c conda-forge python
 
     # create arosics environment

tests/CI_docker/context/arosics_ci.docker

-#FROM gms_base_centos:0.4
+FROM ci_base_centos:0.1
 
 # copy some needed stuff to /root
 COPY *.yml /root/
 
 # update the ci_env environment (that already contains all packages installed via 'docker_pyenvs' repo)
 RUN /bin/bash -i -c "\
-    source /root/miniconda3/bin/activate ci_env; \
+    source /root/miniconda3/bin/activate ; \
+    conda update -n base -c conda-forge conda;\
+    source activate ci_env; \
     conda env update -n ci_env -f /root/environment_arosics.yml"

tests/CI_docker/context/environment_arosics.yml

@@ -9,7 +9,6 @@ dependencies:
   - pyqt
   - numpy
   - gdal
-  - conda-forge::libgdal  # force to use conda-forge for libgdal to avoid package version incompatiblies due to mixed channels
   - scikit-image
   - pyproj>2.2.0
   - geopandas