Skip to content

Commit

Permalink
FIX-#2459: Updated TeamCity tests image to use Ray as base image (#2460)
Browse files Browse the repository at this point in the history
Signed-off-by: Gregory Shimansky <[email protected]>
  • Loading branch information
gshimansky authored Nov 30, 2020
1 parent 0aada32 commit fd5d476
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 11 deletions.
5 changes: 0 additions & 5 deletions ci/teamcity/Dockerfile.modin-base

This file was deleted.

28 changes: 22 additions & 6 deletions ci/teamcity/Dockerfile.teamcity-ci
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

0 comments on commit fd5d476

Please sign in to comment.