Update and creation of current profiles

margin-idiom/Dockerfile

@@ -4,11 +4,11 @@
 # https://github.com/datashield/docker-rock
 #
 
-# R 4.5.0, Rock 2.1.6
+# R 4.5.2, Rock 2.1.6
 FROM datashield/rock-base:6.3.4
 
-ENV DSTIDYVERSE_VERSION=v1.0.4
-ENV DSCODA_VERSION=v0.1.0-dev
+ENV DSTIDYVERSE_VERSION=v1.1.1
+ENV DSCODA_VERSION=v0.2.0-dev
 ENV DSSURVIVAL_VERSION=v2.3.0-dev
 ENV DSBASE_VERSION=v6.3.5-dev
 

margin-idiom/Makefile

@@ -5,7 +5,7 @@
 docker_compose_file=docker-compose.yml
 no_cache=true
 name=datashield/rock-margin-idiom
-tag=2.2.0
+tag=2.2.1
 
 # Build Docker image
 build-image:

margin-idiom/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   rock-margin-idiom:
-    image: datashield/rock-margin-idiom:2.2.0
+    image: datashield/rock-margin-idiom:2.2.1
     #build: .
     ports:
       - ${PORT}:8085

mediation/Dockerfile

@@ -4,17 +4,20 @@
 # https://github.com/datashield/docker-rock
 #
 
-FROM datashield/rock-base:6.2-R4.3
+FROM datashield/rock-base:6.3.4-R4.5.2
 
-ENV DSMEDIATION_VERSION 0.0.3
+ENV DSMEDIATION_VERSION=0.0.3
 
-ENV ROCK_LIB /var/lib/rock/R/library
+ENV ROCK_LIB=/var/lib/rock/R/library
 
-# Install new R packages
-# medflex
-RUN Rscript -e "remotes::install_github('jmpsteen/medflex', dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')"
-# dsMediation
-RUN Rscript -e "remotes::install_github('datashield/dsMediation', ref = '$DSMEDIATION_VERSION', repos = c('https://cloud.r-project.org', 'https://cran.datashield.org'), upgrade = FALSE, lib = '$ROCK_LIB')"
-
-
-RUN chown -R rock $ROCK_LIB
+# Install and update new R packages
+# medflex and dsMediation
+RUN apt-get update -y && \
+    apt-get upgrade -y && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    R -q -e "update.packages(ask=FALSE)" && \
+    Rscript -e "remotes::install_github('kaz-yos/regmedint', ref = 'v0.2.0', dependencies = TRUE, upgrade = TRUE, lib = '$ROCK_LIB')" && \
+    Rscript -e "remotes::install_github('jmpsteen/medflex', ref = 'master', dependencies = TRUE, upgrade = TRUE, lib = '$ROCK_LIB')" && \
+    Rscript -e "remotes::install_github('datashield/dsMediation', ref = '$DSMEDIATION_VERSION', dependencies = TRUE, upgrade = TRUE, lib = '$ROCK_LIB')" && \
+    chown -R rock $ROCK_LIB

mediation/Makefile

@@ -5,7 +5,7 @@
 docker_compose_file=docker-compose.yml
 no_cache=false
 name=datashield/rock-mediation
-r=4.3
+tag=1.0.0
 
 all:
 	sudo docker build --no-cache=true -t="${name}:$(tag)-R$(r)" . && \
@@ -17,10 +17,10 @@ all:
 
 # Build Docker image
 build-image:
-	sudo docker build --no-cache=$(no_cache) -t="${name}:$(tag)" .
+	docker build --no-cache=$(no_cache) -t="${name}:$(tag)" .
 
 push-image:
-	sudo docker image push ${name}:$(tag)
+	docker image push ${name}:$(tag)
 
 
 up:

mediation/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   rock-mediation:
-    image: datashield/rock-mediation:latest
+    image: datashield/rock-mediation:1.0.0
     #build: .
     ports:
       - ${PORT}:8085

molgenis-rock-base-permissive/Dockerfile

@@ -0,0 +1,20 @@
+#
+# Rock R Server Dockerfile for 'molgenis rock base permissive' profile
+#
+# https://github.com/datashield/docker-rock
+#
+
+# Use 'datashield/molgenis-rock-base:1.0.0'
+FROM datashield/molgenis-rock-base:1.0.0
+
+ENV DSBASE_VERSION=v6.3.4-permissive
+
+ENV ROCK_LIB=/var/lib/rock/R/library
+
+# Create Labels
+
+LABEL dsBase=$DSBASE_VERSION
+
+# Update of packages - dsBase
+RUN Rscript -e "remotes::install_github('datashield/dsBase', ref = '$DSBASE_VERSION', dependencies = TRUE, upgrade = FALSE, lib = '$ROCK_LIB')" && \
+    chown -R rock $ROCK_LIB