diff --git a/docker-compose.yml b/docker-compose.yml index e16d346..7888b8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.8" services: fastrl_build: build: diff --git a/fastrl.Dockerfile b/fastrl.Dockerfile index f975a4c..6137ff0 100644 --- a/fastrl.Dockerfile +++ b/fastrl.Dockerfile @@ -88,11 +88,16 @@ ENV PATH="/home/$CONTAINER_USER/.local/bin:${PATH}" RUN pip install setuptools==60.7.0 COPY --chown=$CONTAINER_USER:$CONTAINER_GROUP . fastrl -RUN sudo apt-get -y install cmake +RUN sudo apt-get -y install cmake python3.8-venv -# RUN curl https://get.modular.com | sh - && \ -# modular auth mut_9b52dfea7b05427385fdeddc85dd3a64 && \ -# modular install mojo +RUN curl https://get.modular.com | sh - && \ + modular auth mut_9b52dfea7b05427385fdeddc85dd3a64 && \ + modular install mojo + +RUN BASHRC=$( [ -f "$HOME/.bash_profile" ] && echo "$HOME/.bash_profile" || echo "$HOME/.bashrc" ) && \ + echo 'export MODULAR_HOME="/home/fastrl_user/.modular"' >> "$BASHRC" && \ + echo 'export PATH="/home/fastrl_user/.modular/pkg/packages.modular.com_mojo/bin:$PATH"' >> "$BASHRC" && \ + source "$BASHRC" # RUN /bin/bash -c "if [[ $BUILD == 'dev' ]] ; then echo \"Development Build\" && cd fastrl/data && mv pyproject.toml pyproject.toml_tmp && pip install -e . --no-dependencies && mv pyproject.toml_tmp pyproject.toml && cd ../; fi"