d

yamls/zhichan/ipself-web-deployment.yaml

@@ -18,11 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: ipself
-<<<<<<< HEAD
         image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:6.0.2
-=======
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:6.0.1
->>>>>>> 8e8fc9144eb973210b52bc7d020ab311fc0b164e
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/zc-channel-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: zc-channel
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:4.0.5
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:4.0.45
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

yamls/zhichan/zc-channel-jdweb-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: zc-channel-jdweb
+  namespace: chaolai
+  labels:
+    app: zc-channel-jdweb
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+        app: zc-channel-jdweb
+  template:
+    metadata:
+      labels:
+        app: zc-channel-jdweb
+    spec:
+      restartPolicy: Always
+      containers:
+      - name: zc-channel-jdweb
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:3.0.52
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 80
+        env:
+        - name:  TZ
+          value: Asia/Shanghai
+        - name:  LANG
+          value: zh_CN.UTF-8
+        - name: APP_ENV
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: APP_ENV
+        - name: DB_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_HOST
+        - name:  DB_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_PORT
+        - name:  DB_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_PWD
+        - name:  DB_USER
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: DB_USER
+        - name:  ZC_CHANNEL_WEB_DB_NAME
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: ZC_CHANNEL_WEB_DB_NAME
+        - name:  ZC_CHANNEL_WEB_REDIS_DB
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: ZC_CHANNEL_WEB_REDIS_DB
+        - name:  REDIS_HOST
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_HOST
+        - name:  REDIS_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PORT
+        - name:  REDIS_PWD
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: REDIS_PWD
+
+        - name:  NODE_PORT
+          valueFrom:
+              configMapKeyRef:
+                  name: zhichan-config
+                  key: NODE_PORT
+---
+
+kind: Service
+apiVersion: v1
+metadata:
+  labels:
+     app: zc-channel-jdweb-service
+  name: zc-channel-jdweb-service
+  namespace: chaolai
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      targetPort: 80
+      nodePort: 19400
+  selector:
+      app: zc-channel-jdweb

yamls/zhichan/zc-channel-web-deployment.yaml

@@ -18,7 +18,7 @@ spec:
       restartPolicy: Always
       containers:
       - name: zc-channel-web
-        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:3.0.4
+        image: registry.cn-beijing.aliyuncs.com/hantang2/imgshare:3.0.56
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80