add .env file to .gitignore

updated /status location in nginx.conf Signed-off-by: Stefan Maute <stefan.maute@bosch-si.com>
eclipse-ditto · Mar 8, 2019 · 266a7b7 · 266a7b7
1 parent 3e9e23e
commit 266a7b7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ dependencies.txt
 /deployment/docker/sandbox/graphite/storage
 ajcore.*.txt
 *.mdb
+.env
diff --git a/deployment/docker/.env b/deployment/docker/.env
diff --git a/deployment/docker/nginx.conf b/deployment/docker/nginx.conf
@@ -81,7 +81,9 @@ http {
     location /status {
       include nginx-cors.conf;
 
-      proxy_pass                    http://gateway:8080/overall/status;
+      # switch to overall route for new versions
+      # proxy_pass                    http://gateway:8080/overall/status;
+      proxy_pass                    http://gateway:8080/status;
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
       proxy_set_header              X-Real-IP           $remote_addr;

diff --git a/deployment/kubernetes/nginx/nginx.conf b/deployment/kubernetes/nginx/nginx.conf
@@ -81,7 +81,9 @@ http {
     location /status {
       include nginx-cors.conf;
 
-      proxy_pass                    http://gateway:8080/overall/status;
+      # switch to overall route for new versions
+      # proxy_pass                    http://gateway:8080/overall/status;
+      proxy_pass                    http://gateway:8080/status;
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
       proxy_set_header              X-Real-IP           $remote_addr;

diff --git a/deployment/openshift/ditto/ditto-cluster.yaml b/deployment/openshift/ditto/ditto-cluster.yaml
@@ -20,7 +20,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: concierge
-        image: docker.io/eclipse/ditto-concierge:0.8.0
+        image: docker.io/eclipse/ditto-concierge:lastest
         imagePullPolicy: IfNotPresent
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
@@ -93,7 +93,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: connectivity
-        image: docker.io/eclipse/ditto-connectivity:0.8.0
+        image: docker.io/eclipse/ditto-connectivity:latest
         imagePullPolicy: IfNotPresent
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
@@ -166,7 +166,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: things
-        image: docker.io/eclipse/ditto-things:0.8.0
+        image: docker.io/eclipse/ditto-things:latest
         imagePullPolicy: IfNotPresent
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
@@ -238,7 +238,7 @@ spec:
     spec:
       containers:
       - name: things-search
-        image: docker.io/eclipse/ditto-things-search:0.8.0
+        image: docker.io/eclipse/ditto-things-search:latest
         imagePullPolicy: IfNotPresent
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
@@ -309,7 +309,7 @@ spec:
     spec:
       containers:
       - name: policies
-        image: docker.io/eclipse//eclipse-ditto-policies:0.8.0
+        image: docker.io/eclipse//eclipse-ditto-policies:latest
         imagePullPolicy: IfNotPresent
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]
@@ -381,7 +381,7 @@ spec:
     spec:
       containers:
       - name: gateway
-        image: docker.io/eclipse/ditto-gateway:0.8.0
+        image: docker.io/eclipse/ditto-gateway:latest
         imagePullPolicy: IfNotPresent
         command: ["java"]
         args: ["-jar", "/opt/ditto/starter.jar"]

diff --git a/deployment/openshift/nginx/nginx.conf b/deployment/openshift/nginx/nginx.conf
@@ -81,7 +81,9 @@ http {
     location /status {
       include nginx-cors.conf;
 
-      proxy_pass                    http://gateway:8080/overall/status
+      # switch to overall route for new versions
+      # proxy_pass                    http://gateway:8080/overall/status
+      proxy_pass                    http://gateway:8080/status
       proxy_http_version            1.1;
       proxy_set_header              Host                $http_host;
       proxy_set_header              X-Real-IP           $remote_addr;