Merge pull request #34 from alainlep/docker-compose-improvements

Docker compose improvements
grand-stack · Nov 6, 2019 · 8a9a5cc · 8a9a5cc
2 parents 20e709b + b30d327
commit 8a9a5cc
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 22 deletions.
diff --git a/api/.dockerignore b/api/.dockerignore
@@ -0,0 +1 @@
+.env
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -7,6 +7,6 @@ COPY package.json .
 RUN npm install
 COPY . .
 
-EXPOSE 4000
+EXPOSE 4001
 
 CMD ["npm", "start"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,14 @@ services:
   api:
     build: ./api
     ports:
-      - 4000:4000
+      - 4001:4001
+    environment:
+      - NEO4J_URI=bolt://neo4j:7687
+      - NEO4J_USER=neo4j
+      - NEO4J_PASSWORD=letmein
+      - GRAPHQL_LISTEN_PORT=4001
+      - GRAPHQL_URI=http://api:4001/graphql      
+
     links:
     - neo4j
     depends_on:
@@ -26,6 +33,9 @@ services:
     build: ./ui
     ports:
       - 3000:3000
+    environment:
+      - REACT_APP_GRAPHQL_URI=/graphql
+      - PROXY=http://api:4001/graphql
     links:
     - api
     depends_on:

diff --git a/ui/.dockerignore b/ui/.dockerignore
@@ -0,0 +1 @@
+.env
diff --git a/ui/.env b/ui/.env
@@ -1 +1,2 @@
-REACT_APP_GRAPHQL_URI=http://localhost:4001/graphql
+REACT_APP_GRAPHQL_URI=/graphql
+PROXY=http://localhost:4001/graphql
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -23,6 +23,7 @@
     "now-build": "react-scripts build"
   },
   "devDependencies": {
+    "http-proxy-middleware": "^0.20.0",
     "husky": "^2.7.0",
     "lint-staged": "^8.2.1"
   },

diff --git a/ui/src/setupProxy.js b/ui/src/setupProxy.js
@@ -0,0 +1,11 @@
+const proxy = require("http-proxy-middleware");
+
+module.exports = function(app) {
+  app.use(
+    "/graphql",
+    proxy({
+      target: `${process.env.PROXY}`,
+      changeOrigin: true
+    })
+  );
+};