misantamaria commited on
Commit
95feba1
1 Parent(s): 8fc1cff

All references to user deleted

Browse files
Files changed (1) hide show
  1. Dockerfile +7 -23
Dockerfile CHANGED
@@ -38,55 +38,39 @@ RUN R -e "devtools::install_deps('/tmp/', dependencies = TRUE)"
38
  #RUN R -e "install.packages('reticulate')"
39
 
40
 
41
- RUN echo "user $(id)"
42
-
43
- ARG USER=user
44
- ARG UID=1000
45
- ARG GID=1000
46
-
47
- ENV HOME /home/$USER
48
  ENV ENV_PREFIX $HOME/env
49
 
50
  RUN echo "---> Make sudo & setup sudoers"
51
  RUN echo "$(id)"
52
 
53
- RUN adduser $USER sudo
54
- RUN echo "$USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
55
- RUN chown -R $USER:$GID $HOME
56
-
57
-
58
-
59
  ARG RETICULATE_MINICONDA_PATH=/usr/local/share/r-miniconda
60
  ARG RETICULATE_PYTHON_ENV=/usr/virtualenvs/venv_shiny_app
61
  ENV RETICULATE_PYTHON=${RETICULATE_PYTHON_ENV}/bin/python/
62
 
63
- #RUN R -e "reticulate::virtualenv_create(envname='${RETICULATE_PYTHON_ENV}', python='/usr/bin/python3')"
64
- #RUN R -e "reticulate::virtualenv_install(c('numpy', 'pandas', 'wandb', 'hdbscan'), envname='${RETICULATE_PYTHON_ENV}')"
65
-
66
  RUN echo "RETICULATE_PYTHON_ENV=${RETICULATE_PYTHON_ENV}" >> ${HOME}/.Renviron
67
  RUN echo "RETICULATE_PYTHON=${RETICULATE_PYTHON}" >> ${HOME}/.Renviron
68
 
 
69
  ## Export W&B environment variable to Rstudio
70
 
71
  ARG WANDB_API_KEY
72
  RUN echo "WANDB_API_KEY=${WANDB_API_KEY}" >> /${HOME}/.Renviron
73
 
74
- # use an entrypoint script to insure conda environment is properly activated at runtime
75
-
76
- COPY --chown=${UID}:${GID} docker/entrypoint-rstudio.sh /usr/local/bin
77
  RUN chmod u+x /usr/local/bin/entrypoint-rstudio.sh
78
  ENTRYPOINT [ "/usr/local/bin/entrypoint-rstudio.sh" ]
79
 
 
80
  # Rewrite the miniconda path environment in case it has been redefined in the compose file
81
  RUN echo "RETICULATE_MINICONDA_PATH=${RETICULATE_MINICONDA_PATH}" >> ${HOME}/.Renviron
 
82
  RUN echo "---> Make non-activate conda commands available"
83
  RUN # make non-activate conda commands available
84
  ENV PATH=${RETICULATE_MINICONDA_PATH}/bin:${PATH}
85
  RUN echo "--> Permissions"
86
- RUN chown $USER:$GID /home/$USER/.bashrc
87
- RUN chmod +777 /home/$USER/.bashrc
88
 
89
- RUN chown $USER:$GID /home/$USER/.bash_profile
90
- RUN chmod +777 /home/$USER/.bash_profile
91
  RUN echo "--> Go!"
92
 
 
38
  #RUN R -e "install.packages('reticulate')"
39
 
40
 
41
+ ENV HOME /home/
 
 
 
 
 
 
42
  ENV ENV_PREFIX $HOME/env
43
 
44
  RUN echo "---> Make sudo & setup sudoers"
45
  RUN echo "$(id)"
46
 
 
 
 
 
 
 
47
  ARG RETICULATE_MINICONDA_PATH=/usr/local/share/r-miniconda
48
  ARG RETICULATE_PYTHON_ENV=/usr/virtualenvs/venv_shiny_app
49
  ENV RETICULATE_PYTHON=${RETICULATE_PYTHON_ENV}/bin/python/
50
 
51
+ RUN echo "---> RETICULATE PYTHONS"
 
 
52
  RUN echo "RETICULATE_PYTHON_ENV=${RETICULATE_PYTHON_ENV}" >> ${HOME}/.Renviron
53
  RUN echo "RETICULATE_PYTHON=${RETICULATE_PYTHON}" >> ${HOME}/.Renviron
54
 
55
+ RUN echo "---> Export W&B"
56
  ## Export W&B environment variable to Rstudio
57
 
58
  ARG WANDB_API_KEY
59
  RUN echo "WANDB_API_KEY=${WANDB_API_KEY}" >> /${HOME}/.Renviron
60
 
 
 
 
61
  RUN chmod u+x /usr/local/bin/entrypoint-rstudio.sh
62
  ENTRYPOINT [ "/usr/local/bin/entrypoint-rstudio.sh" ]
63
 
64
+ RUN echo "--> rewrute miniconda path"
65
  # Rewrite the miniconda path environment in case it has been redefined in the compose file
66
  RUN echo "RETICULATE_MINICONDA_PATH=${RETICULATE_MINICONDA_PATH}" >> ${HOME}/.Renviron
67
+
68
  RUN echo "---> Make non-activate conda commands available"
69
  RUN # make non-activate conda commands available
70
  ENV PATH=${RETICULATE_MINICONDA_PATH}/bin:${PATH}
71
  RUN echo "--> Permissions"
 
 
72
 
73
+ RUN chmod +777 $HOME/.bashrc
74
+ RUN chmod +777 $HOME/.bash_profile
75
  RUN echo "--> Go!"
76