From 0523c88bb807fdb27d2235a71274a725a64f8a02 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 19 Jan 2021 12:40:40 +0100
Subject: [PATCH] - fixed docker compose for backend - changed backend port to
 4000 - removed volume from development build stage

---
 backend/Dockerfile          |  4 ++--
 docker-compose.override.yml | 12 ++++++------
 docker-compose.yml          |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 3811d1418..8640c3ff8 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -16,7 +16,7 @@ ENV BUILD_COMMIT="0000000"
 ## SET NODE_ENV
 ENV NODE_ENV=production
 ## App Envs
-ENV PORT="3000"
+ENV PORT="4000"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
@@ -55,7 +55,7 @@ FROM base as development
 # local filesystem which will need a rebuild anyway
 
 # Define Volume for workdir folder on development
-VOLUME ${DOCKER_WORKDIR}
+# VOLUME ${DOCKER_WORKDIR}
 
 ##################################################################################
 # BUILD (Does contain all files and is therefore bloated) ########################
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index dd38cacde..03ef42ee1 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -14,10 +14,10 @@ services:
       - ./webapp:/develop-webapp
       - webapp_node_modules:/develop-webapp/node_modules
   backend:
-    image: ocelotsocialnetwork/develop-backend:build-and-test
+    image: ocelotsocialnetwork/develop-backend:development
     build:
-      context: backend
-      target: build-and-test
+      context: ./backend
+      target: development
     command: yarn run dev
     environment:
       - SMTP_HOST=mailserver
@@ -26,9 +26,9 @@ services:
       - "DEBUG=${DEBUG}"
       - PUBLIC_REGISTRATION=false
     volumes:
-      - ./backend:/develop-backend
-      - backend_node_modules:/develop-backend/node_modules
-      - uploads:/develop-backend/public/uploads
+      - ./backend:/app
+      - backend_node_modules:/app/node_modules
+      - uploads:/app/public/uploads
   neo4j:
     volumes:
       - neo4j_data:/data
diff --git a/docker-compose.yml b/docker-compose.yml
index 5297bc399..f90dadb0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,12 +36,12 @@ services:
     ports:
       - 4000:4000
     volumes:
-      - ./backend:/develop-backend
-      - backend_node_modules:/develop-backend/node_modules
-      - uploads:/develop-backend/public/uploads
+      - ./backend:/app
+      - backend_node_modules:/app/node_modules
+      - uploads:/app/public/uploads
     environment:
       - NEO4J_URI=bolt://neo4j:7687
-      - GRAPHQL_URI=http://backend:4000
+      - GRAPHQL_URI=http://localhost:4000
       - CLIENT_URI=http://localhost:3000
       - JWT_SECRET=b/&&7b78BF&fv/Vd
       - MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g