Flytt miljøvariabel-definisjoner til docker-compose-fil i hovedrepo (#52

)

Miljøvariablene gjaldt bare for imongr og var ikke relevant for f.eks. tmongr

Installer også tmongr.

dockerfiles/Dockerfile.code-server

@@ -41,10 +41,9 @@ USER 1000
 # Set norsk bokmaal as default system locale
 ENV LC_ALL=nb_NO.UTF-8
 ENV LANG=nb_NO.UTF-8
+ENV R_LIBS_USER=/home/coder/R/library
 
-COPY config/.Renviron /home/coder/.Renviron
-
-RUN mkdir -p /home/coder/R/library \
-    && R -e "install.packages(c('remotes', 'devtools', 'languageserver', 'jsonlite'), lib = '/home/coder/R/library')" \
-    && R -e "remotes::install_github('mong/imongr', lib = '/home/coder/R/library')" \
+RUN mkdir -p ${R_LIBS_USER} \
+    && R -e "install.packages(c('devtools', 'languageserver', 'jsonlite'), lib = Sys.getenv('R_LIBS_USER'), repos = c(CRAN = 'https://packagemanager.posit.co/cran/__linux__/bullseye/latest'))" \
+    && R -e "devtools::install_github(c('mong/imongr', 'mong/tmongr'), lib = '/home/coder/R/library')" \
     && code-server --install-extension reditorsupport.r --install-extension mechatroner.rainbow-csv

dockerfiles/Dockerfile.rstudio

@@ -41,52 +41,8 @@ RUN sed -i 's/^# *\(nb_NO.UTF-8\)/\1/' /etc/locale.gen \
     && echo "LANG=\"nb_NO.UTF-8\"" > /etc/default/locale \
     && update-locale LANG=nb_NO.utf8
 
-# making env vars go all the way into Rstudio console, based on
-# https://github.com/rocker-org/rocker-versioned/issues/91
-ARG TZ=Europe/Oslo
-ENV TZ=${TZ}
-ARG PROXY=
-ENV http_proxy=${PROXY}
-ENV https_proxy=${PROXY}
-ARG INSTANCE=DEV
-ENV IMONGR_CONTEXT=${INSTANCE}
-ARG IMONGR_DB_HOST=db
-ENV IMONGR_DB_HOST=${IMONGR_DB_HOST}
-ARG IMONGR_DB_HOST_VERIFY=db-verify
-ENV IMONGR_DB_HOST_VERIFY=${IMONGR_DB_HOST_VERIFY}
-ARG IMONGR_DB_HOST_QA=db-qa
-ENV IMONGR_DB_HOST_QA=${IMONGR_DB_HOST_QA}
-ARG IMONGR_DB_NAME=imongr
-ENV IMONGR_DB_NAME=${IMONGR_DB_NAME}
-ARG IMONGR_DB_USER=imongr
-ENV IMONGR_DB_USER=${IMONGR_DB_USER}
-ARG IMONGR_DB_PASS=imongr
-ENV IMONGR_DB_PASS=${IMONGR_DB_PASS}
-ARG IMONGR_ADMINER_URL=http://localhost:8888
-ENV IMONGR_ADMINER_URL=${IMONGR_ADMINER_URL}
-ARG SHINYPROXY_USERNAME=imongr@mongr.no
-ENV SHINYPROXY_USERNAME=${SHINYPROXY_USERNAME}
-ARG SHINYPROXY_USERGROUPS=MANAGER,PROVIDER
-ENV SHINYPROXY_USERGROUPS=${SHINYPROXY_USERGROUPS}
-
-RUN touch /home/rstudio/.Renviron \
-    && echo "TZ=${TZ}" > /home/rstudio/.Renviron \
-    && echo "http_proxy=${PROXY}" >> /home/rstudio/.Renviron \
-    && echo "https_proxy=${PROXY}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_CONTEXT=${IMONGR_CONTEXT}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_DB_HOST=${IMONGR_DB_HOST}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_DB_HOST_VERIFY=${IMONGR_DB_HOST_VERIFY}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_DB_HOST_QA=${IMONGR_DB_HOST_QA}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_DB_NAME=${IMONGR_DB_NAME}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_DB_USER=${IMONGR_DB_USER}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_DB_PASS=${IMONGR_DB_PASS}" >> /home/rstudio/.Renviron \
-    && echo "IMONGR_ADMINER_URL=${IMONGR_ADMINER_URL}" >> /home/rstudio/.Renviron \
-    && echo "SHINYPROXY_USERNAME=${SHINYPROXY_USERNAME}" >> /home/rstudio/.Renviron \
-    && echo "SHINYPROXY_USERGROUPS=${SHINYPROXY_USERGROUPS}" >> /home/rstudio/.Renviron 
-
-
 # add rstudio user to root group
 ENV ROOT=TRUE
 
 RUN R -e "install.packages(c('lintr'))" \
-    && R -e "remotes::install_github('mong/imongr')"
+    && R -e "remotes::install_github(c('mong/imongr', 'mong/tmongr'))"