v2

.rancher-pipeline.yml

@@ -4,7 +4,7 @@ stages:
   - publishImageConfig:
       dockerfilePath: ./Dockerfile
       buildContext: .
-      tag: bbowenhhuang/tve-member-ui:v2
+      tag: bbowenhhuang/tve-member-ui:v1
       pushRemote: true
       registry: index.docker.io
 - name: deploy

Dockerfile

@@ -2,6 +2,4 @@ FROM nginx:latest
 
 COPY dist/  /usr/share/nginx/html/
 
-COPY default.conf /etc/nginx/conf.d/default.conf
-
+COPY default.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
-EXPOSE 2096
\ No newline at end of file

default.conf

@@ -11,33 +11,16 @@
 # Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
 ##
 
-# Default server configuration
-#
-upstream account_api {
-	server tvememberuser:2099 max_fails=5 fail_timeout=10s;
-}
-
-upstream goods_api {
-	server tvememberproduct:2098 max_fails=5 fail_timeout=10s;
-}
 
-upstream pay_api {
-	server tvememberbill:2094 max_fails=5 fail_timeout=10s;
-}
-
-upstream order_api {
-	server tvememberbill:2094 max_fails=5 fail_timeout=10s;
-}
 
 server {
-	listen 2096;
-	#listen [::]:80 default_server;
+	listen       80;
+        listen  [::]:80;
+        server_name  localhost;
 
 	# Add index.php to the list if you are using PHP
 	index index.html index.htm index.nginx-debian.html;
 
-	server_name _;
-
 	location / {
 		try_files $uri $uri/ /index.html;
 		error_page 405 =200 $uri;
@@ -45,27 +28,31 @@ server {
 		root /usr/share/nginx/html;
 	}
 	location /api/account/ {
-		proxy_pass http://account_api;
+		proxy_http_version 1.1;
+		proxy_pass http://tvememberuser.default.svc.cluster.local:2099;
 		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header Host $host;
+		proxy_set_header Host tvememberuser.default.svc.cluster.local;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 	location /api/goods/ {
-		proxy_pass http://goods_api;
+		proxy_http_version 1.1;
+		proxy_pass http://tvememberproduct.default.svc.cluster.local:2098;
 		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header Host $host;
+		proxy_set_header Host tvememberproduct.default.svc.cluster.local;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 	location /api/payment/ {
-		proxy_pass http://pay_api;
+		proxy_http_version 1.1;
+		proxy_pass http://tvememberbill.default.svc.cluster.local:2094;
 		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header Host $host;
+		proxy_set_header Host tvememberbill.default.svc.cluster.local;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 	location /api/order/ {
-		proxy_pass http://pay_api;
+		proxy_http_version 1.1;
+		proxy_pass http://tvememberbill.default.svc.cluster.local:2094;
 		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header Host $host;
+		proxy_set_header Host tvememberbill.default.svc.cluster.local;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	}
 }

deployment.yaml

@@ -7,7 +7,7 @@ metadata:
     service: tvememberui
 spec:
   ports:
-  - port: 2096
+  - port: 80
     name: http
   selector:
     app: tvememberui
@@ -21,27 +21,27 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   namespace: default
-  name: tvememberui-v2
+  name: tvememberui-v1
   labels:
     app: tvememberui
-    version: v2
+    version: v1
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: tvememberui
-      version: v2
+      version: v1
   template:
     metadata:
       labels:
         app: tvememberui
-        version: v2
+        version: v1
     spec:
       serviceAccountName: member-ui
       containers:
-      - name: tve-member-user
-        image: docker.io/bbowenhhuang/tve-member-ui:v2
+      - name: tve-member-ui
+        image: docker.io/bbowenhhuang/tve-member-ui:v1
         imagePullPolicy: Always
         ports:
-        - containerPort: 2096
+        - containerPort: 80
 ---
\ No newline at end of file