Rework image names

Author: StuartWheater

docker-compose_armadillo.yml

@@ -4,7 +4,6 @@ services:
         ports:
             - 8080:8080
         image: datashield/armadillo_citest:latest
-#        image: datashield/armadillo_devel:latest
         environment:
             LOGGING_CONFIG: 'classpath:logback-file.xml'
             AUDIT_LOG_PATH: '/app/logs/audit.log'
@@ -18,8 +17,6 @@ services:
 
     default:
         hostname: default
-        image: datashield/molgenis-rock-base-permissive:2.0.0
-#        image: datashield/rserver-citest:latest
-#        image: datashield/rserver-devel:latest
+        image: datashield/rock-citest-permissive:latest
         environment:
             DEBUG: "FALSE"

docker-compose_opal.yml

@@ -20,6 +20,6 @@ services:
             - MONGO_INITDB_ROOT_USERNAME=root
             - MONGO_INITDB_ROOT_PASSWORD=foobar
     rock:
-        image: datashield/rock-rio-lamda-permissive:latest
+        image: datashield/rock-citest-permissive:latest
         environment:
             DEBUG: "FALSE"

tests/docker/armadillo/standard/config/application.yml

@@ -14,11 +14,12 @@ armadillo:
   # oidc-admin-user: user@yourdomain.org
   profiles:
     - name: default
-      image: datashield/rock-quebrada-lamda-permissive:latest
+      image: datashield/rock-citest-permissive:latest
       port: 8085
       host: default
       package-whitelist: # Packages for 'permissive'
         - dsBase
+        - dsTidyverse
         - resourcer
       function-blacklist: [ ]
       options: