Merge pull request #226 from nuest/master

o2r-project · Jul 2, 2021 · fdd6237 · fdd6237
2 parents c3109cf + a80b907
commit fdd6237
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ui/docker-compose-dev.yml b/ui/docker-compose-dev.yml
@@ -105,9 +105,9 @@ services:
       #- "MUNCHER_META_TOOL_CONTAINER=meta:dev"
       #- MUNCHER_META_TOOL_CONTAINER_RM=false
       - MUNCHER_SAVE_IMAGE_TARBALL=false # saves space and time during dev
-      - MUNCHER_CONTAINERIT_IMAGE=o2rproject/containerit:geospatial-0.6.0.9000
+      - MUNCHER_CONTAINERIT_IMAGE=o2rproject/containerit:geospatial-0.6.0.9004
       - MUNCHER_CONTAINERIT_FILTER_BASE_IMAGE_PKGS=true
-      - "MUNCHER_CONTAINERIT_BASE_IMAGE=rocker/geospatial:3.6.2"
+      - "MUNCHER_CONTAINERIT_BASE_IMAGE=rocker/geospatial:4.0.5"
       #- "MUNCHER_META_TOOL_CONTAINER=meta:dev"
       #- MUNCHER_ALLOW_INVALID_METADATA=true
 

diff --git a/ui/docker-compose.yml b/ui/docker-compose.yml
@@ -64,9 +64,10 @@ services:
       #- "MUNCHER_META_TOOL_CONTAINER=meta:dev"
       #- MUNCHER_META_TOOL_CONTAINER_RM=false
       - MUNCHER_SAVE_IMAGE_TARBALL=false # saves space and time during dev
-      - MUNCHER_CONTAINERIT_IMAGE=o2rproject/containerit:geospatial-0.6.0.9000
+      - MUNCHER_CONTAINERIT_IMAGE=o2rproject/containerit:geospatial-0.6.0.9004
+      #- MUNCHER_CONTAINERIT_IMAGE=containerit:geospatial-dev
       - MUNCHER_CONTAINERIT_FILTER_BASE_IMAGE_PKGS=true
-      - "MUNCHER_CONTAINERIT_BASE_IMAGE=rocker/geospatial:3.6.2"
+      - "MUNCHER_CONTAINERIT_BASE_IMAGE=rocker/geospatial:4.0.5"
       #- "MUNCHER_META_TOOL_CONTAINER=meta:dev"
       #- MUNCHER_ALLOW_INVALID_METADATA=true
 
@@ -99,7 +100,7 @@ services:
       - OAUTH_STARTUP_FAIL_ON_ERROR=false
 
   shipper:
-    image: o2rproject/o2r-shipper:e1ce0e6
+    image: o2rproject/o2r-shipper:8f95fd6
     depends_on:
       - mongodb
       - configmongodb