misantamaria commited on
Commit
36fc8c4
·
1 Parent(s): 04c66c2

Tratando de arreglar los docker

Browse files
Files changed (3) hide show
  1. Dockerfile +17 -17
  2. Dockerfile.med +20 -8
  3. local_build_docker_med.sh +2 -1
Dockerfile CHANGED
@@ -21,23 +21,23 @@ RUN echo "${USER_ID} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
21
 
22
  RUN chown ${USER_ID}:${GROUP_ID} /var/run/s6
23
 
24
- RUN chown ${USER_ID}:${GROUP_ID} /home/data \
25
- && chown ${USER_ID}:${GROUP_ID} /home/data/wandb_artifacts \
26
- && chown ${USER_ID}:${GROUP_ID} /var/run/s6 \
27
- && mkdir /home/macu \
28
- && mkdir /home/macu/data
29
 
30
- RUN mv /home/data/wandb_artifacts /home/macu/data/wandb_artifacts
31
 
32
- RUN mkdir /home/app/wandb \
33
- && chown ${USER_ID}:${GROUP_ID} /home/app/wandb \
34
- && chown ${USER_ID}:${GROUP_ID} /home/macu/data/wandb_artifacts \
35
- && mkdir /home/data/wandb_artifacts \
36
- && chmod +777 /home/app/wandb \
37
- && chmod +777 /home/data/wandb_artifacts
38
- RUN mkdir ./artifacts
39
- RUN chown ${USER_ID}:${GROUP_ID} ./artifacts
40
- RUN chmod +777 ./artifacts
41
 
42
 
43
  RUN echo "--> Go!"
@@ -59,8 +59,8 @@ RUN chmod +777 /home/.config/matplotlib
59
 
60
  RUN echo "RETICULATE_MINICONDA_PATH" $RETICULATE_MINICONDA_PATH
61
 
62
- COPY --chown=${USER_ID}:${GROUP_ID} ./entrypoint.sh ./entrypoint.sh
63
- RUN chmod +x ./entrypoint.sh
64
 
65
  #Online
66
  CMD ["R", "--quiet", "-e", "shiny::runApp(Sys.getenv('APP'), host='0.0.0.0', port=as.integer(Sys.getenv('RSTUDIO_PORT')))"]
 
21
 
22
  RUN chown ${USER_ID}:${GROUP_ID} /var/run/s6
23
 
24
+ #RUN chown ${USER_ID}:${GROUP_ID} /home/data \
25
+ # && chown ${USER_ID}:${GROUP_ID} /home/data/wandb_artifacts \
26
+ # && chown ${USER_ID}:${GROUP_ID} /var/run/s6 \
27
+ # && mkdir /home/macu \
28
+ # && mkdir /home/macu/data
29
 
30
+ #RUN mv /home/data/wandb_artifacts /home/macu/data/wandb_artifacts
31
 
32
+ #RUN mkdir /home/app/wandb \
33
+ # && chown ${USER_ID}:${GROUP_ID} /home/app/wandb \
34
+ # && chown ${USER_ID}:${GROUP_ID} /home/macu/data/wandb_artifacts \
35
+ # && mkdir /home/data/wandb_artifacts \
36
+ # && chmod +777 /home/app/wandb \
37
+ # && chmod +777 /home/data/wandb_artifacts
38
+ #RUN mkdir ./artifacts
39
+ #RUN chown ${USER_ID}:${GROUP_ID} ./artifacts
40
+ #RUN chmod +777 ./artifacts
41
 
42
 
43
  RUN echo "--> Go!"
 
59
 
60
  RUN echo "RETICULATE_MINICONDA_PATH" $RETICULATE_MINICONDA_PATH
61
 
62
+ #COPY --chown=${USER_ID}:${GROUP_ID} ./entrypoint.sh ./entrypoint.sh
63
+ #RUN chmod +x ./entrypoint.sh
64
 
65
  #Online
66
  CMD ["R", "--quiet", "-e", "shiny::runApp(Sys.getenv('APP'), host='0.0.0.0', port=as.integer(Sys.getenv('RSTUDIO_PORT')))"]
Dockerfile.med CHANGED
@@ -1,4 +1,5 @@
1
  FROM misantamaria/dvats-rstudio:rocker-ml4.2
 
2
  #Permissions
3
  RUN mkdir /var/run/s6
4
  ###############
@@ -6,10 +7,11 @@ RUN mkdir /var/run/s6
6
  ###############
7
 
8
  RUN echo "--> ARGS"
9
- ARG USER_NAME=user \
10
- USER_ID=1000 \
11
- GROUP_ID \
12
- WANDB_ENTITY \
 
13
  WANDB_PROJECT
14
 
15
 
@@ -20,20 +22,29 @@ ENV USER_NAME=$USER_NAME \
20
  WANDB_ENTITY=$WANDB_ENTITY \
21
  WANDB_PROJECT=$WANDB_PROJECT
22
 
 
 
 
 
 
 
 
 
 
 
23
  RUN echo "--> Setup ENV variables"
24
  #ENV RETICULATE_PYTHON_ENV=/home/env \
25
  ENV ROOT=TRUE \
26
  #RETICULATE_MINICONDA_PATH=/home/miniconda3 \
27
  #1,2,3... En la barata solo tienes 1 :)
28
  CUDA_VISIBLE_DEVICES=0\
29
- ENV_VARS=WANDB_ENTITY,WANDB_PROJECT,USER_NAME,USER_ID,GROUP_ID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES\
30
- HOME="/home"
31
 
32
  ### Copy deepvats
33
  RUN echo "---> Setup volumes"
34
 
35
- #ENV APPDIR='/home/'${USER_NAME}'/app'
36
- ENV APPDIR='/home/app'
37
  ENV DATADIR=$HOME'/data/'
38
  ENV DVATSDIR=$HOME'/dvats/'
39
 
@@ -44,3 +55,4 @@ ENV LOCAL_DATA_PATH=$LOCAL_DATA_PATH
44
  COPY --chown=${USER_ID}:${GROUP_ID} ../r_shiny_app $APPDIR
45
  COPY --chown=${USER_ID}:${GROUP_ID} ${LOCAL_DATA_PATH} $DATADIR
46
  COPY --chown=${USER_ID}:${GROUP_ID} ../dvats $DVATSDIR
 
 
1
  FROM misantamaria/dvats-rstudio:rocker-ml4.2
2
+
3
  #Permissions
4
  RUN mkdir /var/run/s6
5
  ###############
 
7
  ###############
8
 
9
  RUN echo "--> ARGS"
10
+ ARG USER_NAME=USER_NAME
11
+ ARG USER_ID=1000
12
+ ARG GROUP_ID=1000
13
+ ENV HOME /home/$USER_NAME
14
+ ARG WANDB_ENTITY \
15
  WANDB_PROJECT
16
 
17
 
 
22
  WANDB_ENTITY=$WANDB_ENTITY \
23
  WANDB_PROJECT=$WANDB_PROJECT
24
 
25
+ RUN addgroup --gid $GROUP_ID $USER_NAME
26
+ RUN adduser --disabled-password \
27
+ --gecos "Non-root USER_NAME" \
28
+ --uid $USER_ID \
29
+ --gid $GROUP_ID \
30
+ --home $HOME \
31
+ $USER_NAME
32
+ RUN adduser $USER_NAME sudo
33
+ RUN echo "$USER_NAME ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
34
+
35
  RUN echo "--> Setup ENV variables"
36
  #ENV RETICULATE_PYTHON_ENV=/home/env \
37
  ENV ROOT=TRUE \
38
  #RETICULATE_MINICONDA_PATH=/home/miniconda3 \
39
  #1,2,3... En la barata solo tienes 1 :)
40
  CUDA_VISIBLE_DEVICES=0\
41
+ ENV_VARS=WANDB_ENTITY,WANDB_PROJECT,USER_NAME_NAME,USER_ID,GROUP_ID,PASSWORD,ROOT,CUDA_VISIBLE_DEVICES
 
42
 
43
  ### Copy deepvats
44
  RUN echo "---> Setup volumes"
45
 
46
+ #ENV APPDIR='/home/'${USER_NAME_NAME}'/app'
47
+ ENV APPDIR=$HOME'/app'
48
  ENV DATADIR=$HOME'/data/'
49
  ENV DVATSDIR=$HOME'/dvats/'
50
 
 
55
  COPY --chown=${USER_ID}:${GROUP_ID} ../r_shiny_app $APPDIR
56
  COPY --chown=${USER_ID}:${GROUP_ID} ${LOCAL_DATA_PATH} $DATADIR
57
  COPY --chown=${USER_ID}:${GROUP_ID} ../dvats $DVATSDIR
58
+ WORKDIR $HOME
local_build_docker_med.sh CHANGED
@@ -7,7 +7,8 @@ while IFS='=' read -r key value; do
7
  args+=(--build-arg "$key=$value") # Agrega --build-arg y la variable como un elemento
8
  fi
9
  done < .env
10
-
 
11
  # Ejecuta docker build con los argumentos
12
  IMAGE_NAME='dvats-rstudio-ghf:latest'
13
  docker build "${args[@]}" . -f Dockerfile.med -t ${IMAGE_NAME}
 
7
  args+=(--build-arg "$key=$value") # Agrega --build-arg y la variable como un elemento
8
  fi
9
  done < .env
10
+ echo "${args[@]}"
11
+ read -p "Press any key to continue..."
12
  # Ejecuta docker build con los argumentos
13
  IMAGE_NAME='dvats-rstudio-ghf:latest'
14
  docker build "${args[@]}" . -f Dockerfile.med -t ${IMAGE_NAME}