From e81f2344c3a7b0398e6da2f48a914cbeb6c0e0e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Fri, 2 Nov 2018 11:33:08 +0100
Subject: [PATCH] Fix README

---
 docker-compose.override.yml        |  4 ++++
 docker-compose.yml                 |  5 ++---
 kubernetes/README.md               | 18 +++++++++++-------
 kubernetes/backend-deployment.yaml |  2 +-
 kubernetes/backend-service.yaml    |  2 +-
 kubernetes/neo4j-deployment.yaml   |  4 ++--
 kubernetes/neo4j-service.yaml      |  2 +-
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 568376779..22e16da73 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -6,6 +6,10 @@ services:
     volumes:
       - .:/backend
       - /backend/node_modules
+  neo4j:
+    ports:
+      - 7687:7687
+      - 7474:7474
 
 networks:
   hc-network:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8064d02bd..0a47bb3c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: "3.7"
 
 services:
   backend:
+    image: humanconnection/backend:latest
     build: .
     networks:
       - hc-network
@@ -18,9 +19,7 @@ services:
       - MOCK=false
 
   neo4j:
-    ports:
-      - 7687:7687
-      - 7474:7474
+    image: humanconnection/neo4j:latest
     build:
       context: .
       dockerfile: Dockerfile.neo4j
diff --git a/kubernetes/README.md b/kubernetes/README.md
index 3cab40d63..ed396a3a3 100644
--- a/kubernetes/README.md
+++ b/kubernetes/README.md
@@ -5,10 +5,11 @@ First of all start minikube on your machine:
 minikube start
 ```
 
-Build your Docker image, using the Minikube Docker daemon:
+Build Docker images, using the Minikube Docker daemon:
 ```sh
 eval $(minikube docker-env)
 docker build -t humanconnection/backend:latest .
+docker build -t humanconnection/neo4j:latest -f Dockerfile.neo4j .
 ```
 
 check that the image is in Minikube’s Docker registry:
@@ -20,19 +21,22 @@ Now change into directory kubernetes and create services and deployments:
 ```sh
 cd kubernetes
 
-kubectl create -f backend-deployment.yaml neo4j-deployment.yaml neo4j-data-persistentvolumeclaim.yaml
+kubectl create -f neo4j-deployment.yaml,neo4j-data-persistentvolumeclaim.yaml,backend-deployment.yaml,backend-service.yaml,neo4j-service.yaml
 
 # expose the backend deployment
-kubectl expose backend hello-node --type=LoadBalancer
-
-# and create the services
-kubectl create -f backend-service.yaml neo4j-service.yaml
+kubectl expose deployment backend --type=LoadBalancer
+# opionally expose the neo4j deployment
+kubectl expose deployment neo4j --type=LoadBalancer
 ```
 
-You can see the backend in action with
+You can see the backend in action with:
 ```sh
 minikube service backend
 ```
+Get an overview with your minikube dashboard:
+```sh
+minikube dashboard
+```
 
 
 
diff --git a/kubernetes/backend-deployment.yaml b/kubernetes/backend-deployment.yaml
index c372a999d..87a5080ea 100644
--- a/kubernetes/backend-deployment.yaml
+++ b/kubernetes/backend-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.cmd: kompose convert -f ../docker-compose.yml
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
diff --git a/kubernetes/backend-service.yaml b/kubernetes/backend-service.yaml
index fb6db1191..223e8a42b 100644
--- a/kubernetes/backend-service.yaml
+++ b/kubernetes/backend-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.cmd: kompose convert -f ../docker-compose.yml
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
diff --git a/kubernetes/neo4j-deployment.yaml b/kubernetes/neo4j-deployment.yaml
index 9b08960c4..32a0cd303 100644
--- a/kubernetes/neo4j-deployment.yaml
+++ b/kubernetes/neo4j-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.cmd: kompose convert -f ../docker-compose.yml
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels:
@@ -22,7 +22,7 @@ spec:
       - env:
         - name: NEO4J_AUTH
           value: none
-        image: neo4j
+        image: humanconnection/neo4j:latest
         name: neo4j
         ports:
         - containerPort: 7687
diff --git a/kubernetes/neo4j-service.yaml b/kubernetes/neo4j-service.yaml
index b9af4fc19..7ee0606c1 100644
--- a/kubernetes/neo4j-service.yaml
+++ b/kubernetes/neo4j-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yml convert
+    kompose.cmd: kompose convert -f ../docker-compose.yml
     kompose.version: 1.16.0 (0c01309)
   creationTimestamp: null
   labels: