Merge remote-tracking branch 'origin/master' into admin-tags-and-categories

docker-compose.override.yml

@@ -0,0 +1,13 @@
+version: '3.7'
+
+services:
+  webapp:
+    volumes:
+      - .:/nitro-web
+      - node_modules:/nitro-web/node_modules
+      - node_modules_styleguide:/nitro-web/styleguide/node_modules
+    command: yarn run dev
+
+volumes:
+  node_modules:
+  node_modules_styleguide:

docker-compose.yml

@@ -2,17 +2,13 @@ version: '3.7'
 
 services:
   webapp:
-    build:
+    image: humanconnection/nitro-web:latest
-      context: .
+    build: .
     ports:
       - 3000:3000
       - 8080:8080
     networks:
       - hc-network
-    volumes:
-      - .:/HC-WebApp
-      - node_modules:/HC-WebApp/node_modules
-    command: yarn run dev
     environment:
       - HOST=0.0.0.0
       - BACKEND_URL=http://backend:4000

plugins/apollo-config.js

@@ -1,5 +1,5 @@
 export default function({ app }) {
-  const backendUrl = process.BACKEND_URL || 'http://localhost:4000'
+  const backendUrl = process.env.BACKEND_URL || 'http://localhost:4000'
   return {
     httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {