From fd5d47657f2f4d79cb1bddd217b3e09160b7127d Mon Sep 17 00:00:00 2001 From: Gregory Shimansky Date: Mon, 30 Nov 2020 12:08:05 -0600 Subject: [PATCH] FIX-#2459: Updated TeamCity tests image to use Ray as base image (#2460) Signed-off-by: Gregory Shimansky --- ci/teamcity/Dockerfile.modin-base | 5 ----- ci/teamcity/Dockerfile.teamcity-ci | 28 ++++++++++++++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 ci/teamcity/Dockerfile.modin-base diff --git a/ci/teamcity/Dockerfile.modin-base b/ci/teamcity/Dockerfile.modin-base deleted file mode 100644 index de4cdd5912e..00000000000 --- a/ci/teamcity/Dockerfile.modin-base +++ /dev/null @@ -1,5 +0,0 @@ -ARG BASE_IMAGE=ray-project/deploy - -FROM ${BASE_IMAGE} -RUN conda update python -y - diff --git a/ci/teamcity/Dockerfile.teamcity-ci b/ci/teamcity/Dockerfile.teamcity-ci index eec0b4c8c05..9f76f1eb83c 100644 --- a/ci/teamcity/Dockerfile.teamcity-ci +++ b/ci/teamcity/Dockerfile.teamcity-ci @@ -1,4 +1,12 @@ -FROM modin-project/modin-base +# Create images from this container like this (in modin repo root): +# +# git rev-parse HEAD > ci/teamcity/git-rev +# +# tar cf ci/teamcity/modin.tar . +# +# docker build --build-arg ENVIRONMENT=environment.yml -t modin-project/teamcity-ci:${BUILD_NUMBER} -f ci/teamcity/Dockerfile.teamcity-ci ci/teamcity + +FROM rayproject/ray:1.0.1 ARG ENVIRONMENT=environment.yml @@ -10,13 +18,21 @@ WORKDIR /modin # Make RUN commands use `bash --login`: SHELL ["/bin/bash", "--login", "-c"] -RUN conda env create -f ${ENVIRONMENT} - -# Initialize conda in bash config fiiles: +# Initialize conda in bash config files: RUN conda init bash -ENV PATH /opt/conda/envs/modin/bin:$PATH +ENV PATH /root/anaconda3/envs/modin/bin:$PATH + +RUN conda update python -y +RUN conda env create -f ${ENVIRONMENT} +RUN conda install curl PyGithub # Activate the environment, and make sure it's activated: +# The following line also removed conda initialization from +# ~/.bashrc so conda starts complaining that it should be +# initialized for bash. But it is necessary to do it because +# activation is not always executed when "docker exec" is used +# and then conda initialization overwrites PATH with its base +# environment where python doesn't have any packages installed. RUN echo "conda activate modin" > ~/.bashrc RUN echo "Make sure environment is activated" -RUN conda list +RUN conda list -n modin