updates for vm

Author: robkooper

docker-compose.vm.yaml

@@ -0,0 +1,55 @@
+version: '3.2'
+
+services:
+
+  # executor can compile the code
+  executor:
+    volumes:
+      - 'pecan_home:/pecan/'
+      - 'pecan_lib:/usr/local/lib/R/site-library/'
+
+  # use same for R development in rstudio
+  rstudio:
+    volumes:
+      - 'pecan_home:/pecan/'
+      - 'pecan_home:/home/carya/pecan/'
+      - 'pecan_lib:/usr/local/lib/R/site-library/'
+      - '/home/carya/rserver.conf:/etc/rstudio/rserver.conf'
+
+  # use following as template for other models
+  # this can be used if you are changng the code for a model in PEcAN
+  sipnet:
+    volumes:
+      - 'pecan_lib:/usr/local/lib/R/site-library/'
+
+  # Allow to see all docker containers running, restart and see log files.
+  portainer:
+   image: portainer/portainer:latest
+   command:
+     - --admin-password=${PORTAINER_PASSWORD:-}
+     - --host=unix:///var/run/docker.sock
+   restart: unless-stopped
+   networks:
+     - pecan
+   labels:
+     - "traefik.enable=true"
+     - "traefik.backend=portainer"
+     - "traefik.frontend.rule=${TRAEFIK_FRONTEND_RULE:-}PathPrefixStrip: /portainer"
+     - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
+   volumes:
+     - /var/run/docker.sock:/var/run/docker.sock
+     - portainer:/data
+
+volumes:
+  pecan:
+    driver_opts:
+      type: none
+      device: '/home/carya/data'
+      o: bind
+  pecan_home:
+    driver_opts:
+      type: none
+      device: '/home/carya/pecan'
+      o: bind
+  pecan_lib:
+  portainer:

docker-compose.yml

@@ -143,19 +143,6 @@ services:
   # ----------------------------------------------------------------------
   # RStudio
   # ----------------------------------------------------------------------
-  rstudio-nginx:
-    image: pecan/rstudio-nginx:${PECAN_VERSION:-latest}
-    networks:
-      - pecan
-    depends_on:
-      - rstudio
-    labels:
-      - "traefik.enable=true"
-      - "traefik.backend=rstudio"
-      - "traefik.port=80"
-      - "traefik.frontend.rule=${TRAEFIK_HOST:-}PathPrefix:/rstudio"
-      - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
-
   rstudio:
     image: pecan/base:${PECAN_VERSION:-latest}
     command: /work/rstudio.sh
@@ -179,6 +166,11 @@ services:
     volumes:
       - pecan:/data
       - rstudio:/home
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=rstudio"
+      - "traefik.port=80"
+      - "traefik.frontend.rule=${TRAEFIK_HOST:-}PathPrefixStrip:/rstudio"
 
   # ----------------------------------------------------------------------
   # PEcAn application
@@ -226,8 +218,6 @@ services:
     restart: unless-stopped
     networks:
       - pecan
-    ports:
-      - 9999:9999
     environment:
       - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F}
       - FQDN=${PECAN_FQDN:-docker}
@@ -293,7 +283,7 @@ services:
   # PEcAn ED model runner
   ed2:
     user: "${UID:-1001}:${GID:-1001}"
-    image: pecan/model-ed2-git:${PECAN_VERSION:-latest}
+    image: pecan/model-ed2-2.2.0:${PECAN_VERSION:-latest}
     restart: unless-stopped
     networks:
       - pecan
@@ -378,5 +368,4 @@ volumes:
   postgres:
   rabbitmq:
   pecan:
-  portainer:
   rstudio: