Commit 75b7bd30 authored by Daniel Scheffler's avatar Daniel Scheffler

Updated CI container setup files.

Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent f0d81cc1
Pipeline #11998 failed with stages
in 12 minutes and 33 seconds
......@@ -309,7 +309,7 @@ def warp_ndarray(ndarray, in_gt, in_prj=None, out_prj=None, out_dtype=None,
raise ValueError("'out_bounds_prj' cannot have a projection if 'in_prj' and 'out_prj' are not given.")
in_prj = out_prj = out_bounds_prj = "LOCAL_CS[\"MAP\"]"
# ensure GDAL 2 only get WKT1 strings (WKT2 requires GDAL>=3)
# ensure GDAL 2 only gets WKT1 strings (WKT2 requires GDAL>=3)
if in_prj and int(gdal.__version__[0]) < 3:
# noinspection PyTypeChecker
in_prj = CRS(in_prj).to_wkt(version="WKT1_GDAL")
......
......@@ -2,17 +2,17 @@
context_dir="./context"
dockerfile="py_tools_ds_ci.docker"
tag="py_tools_ds_ci:0.14.14"
tag="py_tools_ds_ci:0.15.2"
gitlab_runner="py_tools_ds_gitlab_CI_runner"
echo "#### Build runner docker image"
sudo docker rmi ${tag}
sudo docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir}
docker rmi ${tag}
docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir}
echo "#### Create gitlab-runner (daemon) container with tag; ${tag}"
sudo docker stop ${gitlab_runner}
sudo docker rm ${gitlab_runner}
sudo docker run -d --name ${gitlab_runner} --restart always \
docker stop ${gitlab_runner}
docker rm ${gitlab_runner}
docker run -d --name ${gitlab_runner} --restart always \
-v /var/run/docker.sock:/var/run/docker.sock gitlab/gitlab-runner:latest
echo "#### Register container at gitlab, get token here https://gitext.gfz-potsdam.de/danschef/py_tools_ds/settings/ci_cd"
......@@ -20,7 +20,7 @@ read -p "Please enter gitlab token: " token
echo ""
read -p "Please enter gitlab runner name: " runner_name
echo "New gitlab runner image will named ${gitlab_runner}"
sudo docker exec -it ${gitlab_runner} /bin/bash -c "export RUNNER_EXECUTOR=docker && gitlab-ci-multi-runner register -n \
docker exec -it ${gitlab_runner} /bin/bash -c "export RUNNER_EXECUTOR=docker && gitlab-ci-multi-runner register -n \
--url 'https://gitext.gfz-potsdam.de/ci' \
--registration-token '${token}' \
--run-untagged=true \
......
......@@ -8,8 +8,6 @@ dependencies:
- pip # avoids that conda uses the wrong pip
- numpy
- gdal>=2.1.0
- conda-forge::libgdal # force to use conda-forge for libgdal to avoid package version incompatiblies due to mixed channels (libkea.so.1.4.7: cannot open shared object file: No such file or directory)
# - kealib # fix for libkea.so.1.4.7: cannot open shared object file: No such file or directory (not needed as long as libgdal and gdal are conda-forge packages)
- pyproj>=2.1.0
- scikit-image>=0.16.0
- geopandas
......
FROM gms_base_centos:0.3
FROM gms_base_centos:0.4
RUN yum update -y && \
yum install -y patch # patch: conda skeleton will not work without: # https://stackoverflow.com/questions/40392161/building-conda-skeleton-from-pypi-package-throws-error
......@@ -9,6 +9,7 @@ COPY *.yml /root/
# -> also include packages for conda deployment and upload
RUN /bin/bash -i -c "\
source /root/miniconda3/bin/activate ; \
conda update -n base -c defaults conda;\
source activate ci_env; \
conda env update -n ci_env -f /root/environment_py_tools_ds.yml ; \
conda install -c conda-forge conda-build conda-build-all anaconda-client"
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