tidy up environment

guhuajun · Mar 14, 2018 · 535dd40 · 535dd40
1 parent a6ccf3e
commit 535dd40
Show file tree

Hide file tree

Showing 26 changed files with 35 additions and 41 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
 # environment file for docker-compose
 REPO=robotshop
-TAG=0.2.1
+TAG=0.2.2
diff --git a/K8s/descriptors/cart-deployment.yaml b/K8s/descriptors/cart-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: cart
     spec:
       containers:
-      - image: robotshop/rs-cart:0.2.1
+      - image: robotshop/rs-cart:0.2.2
         name: cart
         ports:
         - containerPort: 8080

diff --git a/K8s/descriptors/cart-service.yaml b/K8s/descriptors/cart-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/catalogue-deployment.yaml b/K8s/descriptors/catalogue-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: catalogue
     spec:
       containers:
-      - image: robotshop/rs-catalogue:0.2.1
+      - image: robotshop/rs-catalogue:0.2.2
         name: catalogue
         ports:
         - containerPort: 8080

diff --git a/K8s/descriptors/catalogue-service.yaml b/K8s/descriptors/catalogue-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/dispatch-deployment.yaml b/K8s/descriptors/dispatch-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: dispatch
     spec:
       containers:
-      - image: robotshop/rs-dispatch:0.2.1
+      - image: robotshop/rs-dispatch:0.2.2
         name: dispatch
         resources: {}
       restartPolicy: Always

diff --git a/K8s/descriptors/dispatch-service.yaml b/K8s/descriptors/dispatch-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/mongodb-deployment.yaml b/K8s/descriptors/mongodb-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: mongodb
     spec:
       containers:
-      - image: robotshop/rs-mongodb:0.2.1
+      - image: robotshop/rs-mongodb:0.2.2
         name: mongodb
         ports:
         - containerPort: 27017

diff --git a/K8s/descriptors/mongodb-service.yaml b/K8s/descriptors/mongodb-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/mysql-deployment.yaml b/K8s/descriptors/mysql-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: mysql
     spec:
       containers:
-      - image: robotshop/rs-shipping-db:0.2.1
+      - image: robotshop/rs-shipping-db:0.2.2
         name: mysql
         ports:
         - containerPort: 3306

diff --git a/K8s/descriptors/mysql-service.yaml b/K8s/descriptors/mysql-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/payment-deployment.yaml b/K8s/descriptors/payment-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,10 +18,7 @@ spec:
         io.kompose.service: payment
     spec:
       containers:
-      - env:
-        - name: AUTOWRAPT_BOOTSTRAP
-          value: flask
-        image: robotshop/rs-payment:0.2.1
+      - image: robotshop/rs-payment:0.2.2
         name: payment
         ports:
         - containerPort: 8080

diff --git a/K8s/descriptors/payment-service.yaml b/K8s/descriptors/payment-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/rabbitmq-deployment.yaml b/K8s/descriptors/rabbitmq-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/rabbitmq-service.yaml b/K8s/descriptors/rabbitmq-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/redis-deployment.yaml b/K8s/descriptors/redis-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/redis-service.yaml b/K8s/descriptors/redis-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/shipping-deployment.yaml b/K8s/descriptors/shipping-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: shipping
     spec:
       containers:
-      - image: robotshop/rs-shipping:0.2.1
+      - image: robotshop/rs-shipping:0.2.2
         name: shipping
         ports:
         - containerPort: 8080

diff --git a/K8s/descriptors/shipping-service.yaml b/K8s/descriptors/shipping-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/user-deployment.yaml b/K8s/descriptors/user-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
         io.kompose.service: user
     spec:
       containers:
-      - image: robotshop/rs-user:0.2.1
+      - image: robotshop/rs-user:0.2.2
         name: user
         ports:
         - containerPort: 8080

diff --git a/K8s/descriptors/user-service.yaml b/K8s/descriptors/user-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/K8s/descriptors/web-deployment.yaml b/K8s/descriptors/web-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
@@ -18,11 +18,8 @@ spec:
         io.kompose.service: web
     spec:
       containers:
-      - image: robotshop/rs-web:0.2.1
+      - image: robotshop/rs-web:0.2.2
         name: web
-        #env:
-          #- name: INSTANA_EUM_KEY
-          #value: <your key here>
         ports:
         - containerPort: 8080
         resources: {}

diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose -f docker-compose.yaml convert
+    kompose.cmd: kompose -f ../docker-compose.yaml convert
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -108,8 +108,6 @@ services:
     image: ${REPO}/rs-payment:${TAG}
     depends_on:
       - rabbitmq
-    environment:
-      - AUTOWRAPT_BOOTSTRAP=flask
     ports:
       - "8080"
     networks:

diff --git a/payment/Dockerfile b/payment/Dockerfile
@@ -2,6 +2,8 @@ FROM python:3
 
 EXPOSE 8080
 
+ENV AUTOWRAPT_BOOTSTRAP=flask
+
 WORKDIR /app
 
 COPY requirements.txt /app/

diff --git a/payment/docker-compose.yaml b/payment/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
   payment:
     build:
       context: .
-    image: steveww/rs-payment
+    image: robotshop/rs-payment
     depends_on:
       - rabbitmq
     ports: