misantamaria commited on
Commit
04a01cd
·
1 Parent(s): 00384fe

dockerimage from dockerhub

Browse files
Files changed (1) hide show
  1. Dockerfile +9 -71
Dockerfile CHANGED
@@ -13,20 +13,7 @@
13
  # Base image #
14
  ##############
15
  # Adds rstudio server, tiyverse, devtools to rocker/cuda
16
- FROM dvats-rstudio-base:latest
17
-
18
- RUN echo "--> Prior installations" \
19
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A4B469963BF863CC \
20
- set -e; \
21
- apt-get update --fix-missing \
22
- && apt-get install -y \
23
- python3-pip wget bzip2 curl \
24
- git sudo libarchive-dev libtiff5-dev zsh\
25
- #python3 -m pip install --upgrade pip \
26
- python3-venv libxt-dev \
27
- && apt-get clean \
28
- && rm -rf /var/lib/apt/lists/*
29
-
30
 
31
  SHELL [ "/bin/bash", "--login", "-c" ]
32
 
@@ -37,18 +24,15 @@ RUN echo "--> ARGS"
37
  ARG USER_NAME=user \
38
  USER_ID=1000 \
39
  GROUP_ID \
40
- WANDB_API_KEY \
41
  WANDB_ENTITY \
42
  WANDB_PROJECT \
43
- GH_TOKEN
44
 
45
  RUN echo "--> ARGS -> ENV"
46
  ENV USER_NAME=$USER_NAME \
47
  USER_ID=$USER_ID \
48
  GROUP_ID=$GROUP_ID \
49
  WANDB_ENTITY=$WANDB_ENTITY \
50
- WANDB_API_KEY=$WANDB_API_KEY \
51
- GH_TOKEN=$ghtoken \
52
  WANDB_PROJECT=$WANDB_PROJECT
53
 
54
  RUN echo "--> Setup ENV variables"
@@ -59,41 +43,10 @@ ENV RETICULATE_PYTHON_ENV=/home/${USER_NAME}/env \
59
  ENV_VARS=WANDB_ENTITY,WANDB_PROJECT,USER_NAME,USER_ID,GROUP_ID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES\
60
  HOME="/home/${USER_NAME}"
61
 
62
- ###########
63
- # Volumes #
64
- ###########
65
-
66
-
67
-
68
-
69
- ## Install R packages
70
-
71
- # COPY docker/DESCRIPTION /tmp/
72
- COPY --chown=${USER_ID}:${GROUP_ID} docker/DESCRIPTION /tmp/
73
-
74
- RUN echo "--> Install R packages" \
75
- R -e "devtools::install_deps('/tmp/', dependencies = TRUE)"
76
-
77
- ## Reticulate configuration
78
- ENV ENV_PREFIX $HOME/env
79
-
80
- RUN echo "---> Make sudo & setup sudoers"
81
- RUN echo "$(id)"
82
-
83
- ARG RETICULATE_MINICONDA_PATH=/usr/local/share/r-miniconda
84
- ARG RETICULATE_PYTHON_ENV=/usr/virtualenvs/venv_shiny_app
85
- ENV RETICULATE_PYTHON=${RETICULATE_PYTHON_ENV}/bin/python/
86
-
87
  RUN echo "---> RETICULATE PYTHONS"
88
  RUN echo "RETICULATE_PYTHON_ENV=${RETICULATE_PYTHON_ENV}" >> ${HOME}/.Renviron
89
  RUN echo "RETICULATE_PYTHON=${RETICULATE_PYTHON}" >> ${HOME}/.Renviron
90
 
91
- RUN echo "---> Export W&B"
92
- ## Export W&B environment variable to Rstudio
93
-
94
- ARG WANDB_API_KEY
95
- RUN echo "WANDB_API_KEY=${WANDB_API_KEY}" >> ${HOME}/.Renviron
96
-
97
 
98
  ENV MINICONDA_VERSION=4.10.3 \
99
  #ENV MINICONDA_VERSION=23.9.0 \
@@ -151,10 +104,6 @@ RUN chmod u+x /usr/local/bin/postBuild \
151
 
152
  RUN conda list --prefix ${ENV_PREFIX}
153
 
154
-
155
-
156
-
157
-
158
  RUN echo "--> rewrrite miniconda path"
159
  # Rewrite the miniconda path environment in case it has been redefined in the compose file
160
  RUN echo "RETICULATE_MINICONDA_PATH=${RETICULATE_MINICONDA_PATH}" >> ${HOME}/.Renviron
@@ -175,26 +124,16 @@ COPY --chown=${USER_ID}:${GROUP_ID} ../r_shiny_app $HOME/app
175
  COPY --chown=${USER_ID}:${GROUP_ID} ${LOCAL_DATA_PATH} $HOME/data/
176
  COPY --chown=${USER_ID}:${GROUP_ID} ../dvats ${HOME}/dvats
177
 
178
- #RUN echo "--> Setup miniconda & Mamba"
179
-
180
- #RUN echo ". ${HOME}miniconda3/etc/profile.d/conda.sh" >> ${HOME}/rstudio/.bashrc
181
-
182
-
183
- #RUN echo "--> Conda activate"
184
- # Make bash automatically activate the conda environment
185
- #RUN echo "conda activate ${ENV_PREFIX}" >> ${HOME}/rstudio/.bashrc
186
- #echo "export WANDB_ENTITY=${WANDB_ENTITY:-default}" >> ${HOME}/.bashrc
187
- # echo "WANDB_ENTITY=${WANDB_ENTITY:-default}" >> ${HOME}/.Renviron
188
 
189
  # Define an array of environment variable names from the ENV_VARS Compose variable
190
- ARG ENV_VARS=ENV_VARS
191
- RUN echo "---> Setup variables" && \
192
- IFS=',' read -ra NAMES <<< "ENV_VARS" && \
193
- for ENV_VAR_NAsME in "${NAMES[@]}"; do \
194
  #echo "$ENV_VARS" | tr ',' '\n' | while read ENV_VAR_NAME; do \
195
- ENV_VAR_VALUE="${!ENV_VAR_NAME:-default}"; \
196
- echo "$ENV_VAR_NAME=$ENV_VAR_VALUE"; \
197
- done > ${HOME}/.Renviron
198
 
199
  # Install deepvats
200
 
@@ -203,4 +142,3 @@ RUN echo "--> Go!"
203
 
204
  CMD ["R", "--quiet", "-e", "shiny::runApp(host='0.0.0.0', port=${RSTUDIO_PORT:-3838}, launch.browser = FALSE, appDir = '/home/${USER_NAME}/app')"]
205
 
206
- # CMD ["/init"]
 
13
  # Base image #
14
  ##############
15
  # Adds rstudio server, tiyverse, devtools to rocker/cuda
16
+ FROM misantamaria/dvats-rstudio:0
 
 
 
 
 
 
 
 
 
 
 
 
 
17
 
18
  SHELL [ "/bin/bash", "--login", "-c" ]
19
 
 
24
  ARG USER_NAME=user \
25
  USER_ID=1000 \
26
  GROUP_ID \
 
27
  WANDB_ENTITY \
28
  WANDB_PROJECT \
29
+
30
 
31
  RUN echo "--> ARGS -> ENV"
32
  ENV USER_NAME=$USER_NAME \
33
  USER_ID=$USER_ID \
34
  GROUP_ID=$GROUP_ID \
35
  WANDB_ENTITY=$WANDB_ENTITY \
 
 
36
  WANDB_PROJECT=$WANDB_PROJECT
37
 
38
  RUN echo "--> Setup ENV variables"
 
43
  ENV_VARS=WANDB_ENTITY,WANDB_PROJECT,USER_NAME,USER_ID,GROUP_ID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES\
44
  HOME="/home/${USER_NAME}"
45
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
46
  RUN echo "---> RETICULATE PYTHONS"
47
  RUN echo "RETICULATE_PYTHON_ENV=${RETICULATE_PYTHON_ENV}" >> ${HOME}/.Renviron
48
  RUN echo "RETICULATE_PYTHON=${RETICULATE_PYTHON}" >> ${HOME}/.Renviron
49
 
 
 
 
 
 
 
50
 
51
  ENV MINICONDA_VERSION=4.10.3 \
52
  #ENV MINICONDA_VERSION=23.9.0 \
 
104
 
105
  RUN conda list --prefix ${ENV_PREFIX}
106
 
 
 
 
 
107
  RUN echo "--> rewrrite miniconda path"
108
  # Rewrite the miniconda path environment in case it has been redefined in the compose file
109
  RUN echo "RETICULATE_MINICONDA_PATH=${RETICULATE_MINICONDA_PATH}" >> ${HOME}/.Renviron
 
124
  COPY --chown=${USER_ID}:${GROUP_ID} ${LOCAL_DATA_PATH} $HOME/data/
125
  COPY --chown=${USER_ID}:${GROUP_ID} ../dvats ${HOME}/dvats
126
 
 
 
 
 
 
 
 
 
 
 
127
 
128
  # Define an array of environment variable names from the ENV_VARS Compose variable
129
+ #ARG ENV_VARS=ENV_VARS
130
+ #RUN echo "---> Setup variables" && \
131
+ # IFS=',' read -ra NAMES <<< "ENV_VARS" && \
132
+ # for ENV_VAR_NAsME in "${NAMES[@]}"; do \
133
  #echo "$ENV_VARS" | tr ',' '\n' | while read ENV_VAR_NAME; do \
134
+ # ENV_VAR_VALUE="${!ENV_VAR_NAME:-default}"; \
135
+ # echo "$ENV_VAR_NAME=$ENV_VAR_VALUE"; \
136
+ # done > ${HOME}/.Renviron
137
 
138
  # Install deepvats
139
 
 
142
 
143
  CMD ["R", "--quiet", "-e", "shiny::runApp(host='0.0.0.0', port=${RSTUDIO_PORT:-3838}, launch.browser = FALSE, appDir = '/home/${USER_NAME}/app')"]
144