switch to muncher 0.30.x, now includes loader

o2r-project · Apr 21, 2021 · 787dfe4 · 787dfe4
1 parent 740c5f3
commit 787dfe4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 237 deletions.
diff --git a/ui/dev/nginx-dev-local-microservices.conf b/ui/dev/nginx-dev-local-microservices.conf
@@ -27,24 +27,11 @@ http {
       proxy_set_header Host $host;
     }
 
-    # muncher handles most API requests
     location /api {
       proxy_pass http://172.17.0.1:8080;
       proxy_redirect off;
       proxy_set_header Host $host;
-    }
-
-    # split endpoint between loader for POSTs and muncher for all other operations
-    location /api/v1/compendium {
-      proxy_pass http://172.17.0.1:8088;
-      proxy_redirect off;
-      proxy_set_header Host $host;
       proxy_read_timeout 30m;
-
-      # For requests that *are not* a POST, pass to muncher
-      limit_except POST {
-        proxy_pass http://172.17.0.1:8080;
-      }
     }
 
     location ~* \.io {

diff --git a/ui/dev/nginx-share.conf b/ui/dev/nginx-share.conf
@@ -5,6 +5,7 @@
       proxy_pass http://muncher:8080;
       proxy_redirect off;
       proxy_set_header Host $host;
+      proxy_read_timeout 30m;
     }
 
     location ~* ^/api/v1/compendium/[^/]+/binding {
@@ -15,20 +16,6 @@
       proxy_set_header Host $host;
     }
 
-    location /api/v1/compendium {
-      include nginx-cors.conf;
-
-      proxy_pass http://loader:8088;
-      proxy_redirect off;
-      proxy_set_header Host $host;
-      proxy_read_timeout 30m;
-
-      # For requests that *are not* a POST, pass to muncher
-      limit_except POST {
-        proxy_pass http://muncher:8080;
-      }
-    }
-
     location ~* \.io {
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
@@ -76,14 +63,6 @@
       proxy_pass http://shipper:8087;
     }
 
-    location /api/v1/inspection {
-      include nginx-cors.conf;
-
-      proxy_set_header Host $host;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_pass http://inspecter:8091;
-    }
-
     location /api/v1/bindings {
       include nginx-cors.conf;
 

diff --git a/ui/docker-compose-dev.yml b/ui/docker-compose-dev.yml
@@ -84,7 +84,7 @@ services:
   #    - elasticsearch
 
   muncher:
-    image: o2rproject/o2r-muncher:0.27.0
+    image: o2rproject/o2r-muncher:0.30.0
     depends_on:
       - mongodb
       - configmongodb
@@ -102,6 +102,7 @@ services:
       - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:*
 
       - "MUNCHER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43"
+      #- "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
@@ -110,22 +111,6 @@ services:
       #- "MUNCHER_META_TOOL_CONTAINER=meta:dev"
       #- MUNCHER_ALLOW_INVALID_METADATA=true
 
-  loader:
-    image: o2rproject/o2r-loader:0.12.0
-    depends_on:
-      - mongodb
-      - configmongodb
-    volumes:
-      - o2rstorage:/tmp/o2r
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - "LOADER_MONGODB=mongodb://mongodb:27017/"
-      - LOADER_PORT=8088
-      - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:*
-      - LOADER_VOLUME=ui_o2rstorage
-      - "LOADER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43"
-      #- "LOADER_META_TOOL_CONTAINER=meta:dev"
-
   informer:
     image: o2rproject/o2r-informer:0.5.0
     depends_on:
@@ -186,14 +171,6 @@ services:
       SHIPPER_BASE_PATH: "/tmp/o2r"
       PYTHONUNBUFFERED: "0"
 
-  inspecter:
-    image: o2rproject/o2r-inspecter:0.0.1
-    volumes:
-      - o2rstorage:/tmp/o2r
-    environment:
-      - INSPECTER_PORT=8091
-      - DEBUGME=inspecter
-
   bindings:
     #image: o2rproject/o2r-bindings:latest
     build: ./bindings
@@ -245,7 +222,6 @@ services:
       #- finder
       - muncher
       - informer
-      - loader
       - shipper
       - bindings
       - ui

diff --git a/ui/docker-compose.yml b/ui/docker-compose.yml
@@ -43,7 +43,7 @@ services:
       - "1234:1234"
 
   muncher:
-    image: o2rproject/o2r-muncher:0.27.0
+    image: o2rproject/o2r-muncher:0.30.0
     depends_on:
       - mongodb
       - configmongodb
@@ -61,30 +61,15 @@ services:
       - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:*
 
       - "MUNCHER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43"
+      #- "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_FILTER_BASE_IMAGE_PKGS=true
       - "MUNCHER_CONTAINERIT_BASE_IMAGE=rocker/geospatial:3.6.2"
       #- "MUNCHER_META_TOOL_CONTAINER=meta:dev"
       #- MUNCHER_ALLOW_INVALID_METADATA=true
-
-  loader:
-    image: o2rproject/o2r-loader:0.12.0
-    depends_on:
-      - mongodb
-      - configmongodb
-    volumes:
-      - o2rstorage:/tmp/o2r
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - "LOADER_MONGODB=mongodb://mongodb:27017/"
-      - LOADER_PORT=8088
-      - DEBUG=*,-mquery,-express:*,-express-session,-body-parser:*
-      - LOADER_VOLUME=ui_o2rstorage
-      - "LOADER_META_TOOL_CONTAINER=o2rproject/o2r-meta:1447d43"
-      #- "LOADER_META_TOOL_CONTAINER=meta:dev"
-
+
   informer:
     image: o2rproject/o2r-informer:0.5.0
     depends_on:
@@ -128,14 +113,6 @@ services:
       SHIPPER_BASE_PATH: "/tmp/o2r"
       PYTHONUNBUFFERED: "0"
 
-  inspecter:
-    image: o2rproject/o2r-inspecter:0.0.1
-    volumes:
-      - o2rstorage:/tmp/o2r
-    environment:
-      - INSPECTER_PORT=8091
-      - DEBUGME=inspecter
-
   bindings:
     image: o2rproject/o2r-bindings:latest
     #build: ./bindings
@@ -167,7 +144,6 @@ services:
       - bouncer
       - muncher
       - informer
-      - loader
       - shipper
       - bindings
     ports: