diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40d47a70fcd51995fe01f17252d29d8e35b3dc6e..ecfe4ae31b91c8aacfad9ec05a4fa8b73a5b333d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ build-image: - VERSION=$(cat version.txt) - IMAGE_NAME="$CI_REGISTRY_IMAGE"/"$CI_COMMIT_REF_NAME":latest # Build to latest, tag to version will be manual - docker build -t ${IMAGE_NAME} --build-arg version=${VERSION} -f docker/Dockerfile . + - docker run ${IMAGE_NAME} bash -c "python -c 'import plant'" # To test plant installation - docker push ${IMAGE_NAME} tags: diff --git a/docker/Dockerfile b/docker/Dockerfile index ceff73025bed972ab96c20ba81accd599f2c35b7..f4821555aa2699aade90083343997d609958f31e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,18 +1,12 @@ -FROM continuumio/miniconda3:latest +FROM continuumio/miniconda3:4.7.12 # Install plant library -RUN conda install -c plant plant -RUN conda install scikit-learn pandas - -RUN mkdir /projects -WORKDIR /projects -RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd - -# install maap-py library -ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch master https://github.com/MAAP-Project/maap-py.git \ - && cd maap-py \ - && python setup.py install +WORKDIR /root +RUN wget -O plant.tar https://gitlab.com/plant/plant/-/archive/b93542f5cf117b0469f34dce7ef70bc772f700bf/plant-b93542f5cf117b0469f34dce7ef70bc772f700bf.tar \ + && tar -xvf plant.tar && mv plant-* plant +RUN conda init && conda install --no-update-deps conda-build -y +RUN conda build plant --python=3.7 +RUN conda install --no-update-deps --use-local plant -y ARG version ENV DOCKERIMAGE_PATH='mas.maap-project.org:5000/root/ade_base_images/plant:${version}'