Browse Source

no message

DESKTOP-3E973C2\Admin 4 years ago
parent
commit
6a8e5f00f6

+ 6 - 0
mchsrv/Dockerfile

@@ -0,0 +1,6 @@
+FROM registry-vpc.cn-beijing.aliyuncs.com/jiaxiang/alpine:cst
+COPY mchsrv /go/bin/
+COPY agollo.json /go/bin
+RUN chmod +x /go/bin/mchsrv
+WORKDIR /go/bin/
+CMD ["/go/bin/mchsrv"]

+ 10 - 0
mchsrv/agollo.json

@@ -0,0 +1,10 @@
+{
+  "appId": "merchant",
+  "cluster": "fish3",
+  "namespaceNames": [
+    "server.yaml"
+  ],
+  "ip": "10.28.74.159:8080",
+  "oneNamespaceMode": false,
+  "tagname": "yaml"
+}

BIN
mchsrv/mchsrv


+ 9 - 0
mchsrv/push.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+release=$1
+
+[ ! -n "$release" ] && exit 1
+
+docker build -t registry-vpc.cn-beijing.aliyuncs.com/xinyue/mchsrv:${release} .
+docker push registry-vpc.cn-beijing.aliyuncs.com/xinyue/mchsrv:${release}
+

+ 13 - 0
sharebms2-nginx/Dockerfile

@@ -0,0 +1,13 @@
+FROM nginx:1.15.6
+
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+RUN echo 'Asia/Shanghai' > /etc/timezone
+
+RUN rm -f /etc/nginx/conf.d/default.conf
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY conf.d /etc/nginx/conf.d/
+
+RUN rm -rf /usr/share/nginx/html
+ADD html.tar.gz /usr/share/nginx/
+
+EXPOSE 9191

+ 2 - 0
sharebms2-nginx/README.md

@@ -0,0 +1,2 @@
+上传网站目录的压缩文件:html.tar.gz
+并且解压后是html目录

+ 10 - 0
sharebms2-nginx/conf.d/default.conf

@@ -0,0 +1,10 @@
+server {
+    listen       80 default;
+    allow   100.64.0.0/10;
+    deny all;
+    # 禁止IP访问及未绑定的域名跳转
+    location = /healthz {
+        access_log off;
+        return 200;
+    }
+}

+ 32 - 0
sharebms2-nginx/conf.d/sharebms2.conf

@@ -0,0 +1,32 @@
+server {
+    listen 80;
+
+    add_header Access-Control-Allow-Origin *;
+    add_header Access-Control-Allow-Headers *;
+    add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
+    if ($request_method = 'OPTIONS') {
+        return 204;
+    }
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Remote_addr $remote_addr;
+    proxy_set_header X-Real_IP $remote_addr;
+    proxy_set_header X-CROS true;  # 自定义,有做跨域的时候需要加
+    proxy_set_header Host $host; 
+    proxy_redirect off;
+    proxy_http_version 1.1;
+
+    charset utf-8;
+
+    server_name share-fish.jiaxianghudong.com;
+    location / {
+        root /usr/share/nginx/html/;
+        try_files $uri $uri/ /index.html;
+        #index index.html;
+    }
+
+    location /sharebms/v2/ {
+        proxy_pass http://sharebms2-svc:9191;
+        client_max_body_size 10m;
+    }
+
+}

BIN
sharebms2-nginx/html.tar.gz


+ 50 - 0
sharebms2-nginx/nginx.conf

@@ -0,0 +1,50 @@
+user                    root;
+worker_processes        auto;
+worker_cpu_affinity     auto;
+worker_rlimit_nofile    1048576;
+worker_shutdown_timeout 10s ;
+
+error_log               /var/log/nginx/error.log warn;
+pid                     /var/run/nginx.pid;
+
+events {
+    multi_accept        on;
+    worker_connections  65536;
+    use                 epoll;
+}
+
+http {
+    include             /etc/nginx/mime.types;
+    default_type        application/octet-stream;
+
+    log_format  main    '{ '
+                        '"remote_addr": "$remote_addr", '
+                        '"time_iso8601": "$time_iso8601", '
+                        '"request_method": "$request_method", '
+                        '"scheme": "$scheme", '
+                        '"host": "$host", '
+                        '"request_uri": "$request_uri", '
+                        '"status": $status, '
+                        '"body_bytes_sent": $body_bytes_sent, '
+                        '"http_referer": "$http_referer", '
+                        '"http_user_agent": "$http_user_agent", '
+                        '"http_x_forwarded_for": "$http_x_forwarded_for", '
+                        '"upstream_addr": "$upstream_addr",'
+                        '"upstream_status": $upstream_status,'
+                        '"upstream_cache_status": "$upstream_cache_status",'
+                        '"upstream_response_time": $upstream_response_time,'
+                        '"request_time": $request_time '
+                        ' }';
+                        
+    access_log           /var/log/nginx/access.log  main;
+
+    sendfile             on;
+    #tcp_nopush          on;
+
+    keepalive_timeout    65;
+
+    #gzip                on;
+    server_tokens        off;
+
+    include /etc/nginx/conf.d/*.conf;
+}

+ 9 - 0
sharebms2-nginx/push.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+release=$1
+
+[ ! -n "$release" ] && exit 1
+
+docker build -t registry-vpc.cn-beijing.aliyuncs.com/xinyue/sharebms2-nginx:${release} .
+docker push registry-vpc.cn-beijing.aliyuncs.com/xinyue/sharebms2-nginx:${release}
+

+ 7 - 0
sharebms2/Dockerfile

@@ -0,0 +1,7 @@
+FROM registry-vpc.cn-beijing.aliyuncs.com/jiaxiang/alpine-cst:1
+COPY sharebms2 /go/bin/
+COPY agollo.json /go/bin
+ADD web.tar.gz /go/bin/
+RUN chmod +x /go/bin/sharebms2
+WORKDIR /go/bin/
+CMD ["/go/bin/sharebms2"]

+ 10 - 0
sharebms2/agollo.json

@@ -0,0 +1,10 @@
+{
+  "appId": "sharebms",
+  "cluster": "fish3",
+  "namespaceNames": [
+    "server.yaml"
+  ],
+  "ip": "10.28.74.159:8080",
+  "oneNamespaceMode": false,
+  "tagname": "yaml"
+}

BIN
sharebms2/html.tar.gz


+ 9 - 0
sharebms2/push.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+release=$1
+
+[ ! -n "$release" ] && exit 1
+
+docker build -t registry-vpc.cn-beijing.aliyuncs.com/xinyue/sharebms2:${release} .
+docker push registry-vpc.cn-beijing.aliyuncs.com/xinyue/sharebms2:${release}
+

BIN
sharebms2/sharebms2


BIN
sharebms2/web.tar.gz


+ 6 - 0
sharesrv2/Dockerfile

@@ -0,0 +1,6 @@
+FROM registry-vpc.cn-beijing.aliyuncs.com/jiaxiang/alpine-cst:1
+COPY sharesrv2 /go/bin/
+COPY agollo.json /go/bin
+RUN chmod +x /go/bin/sharesrv2
+WORKDIR /go/bin/
+CMD ["/go/bin/sharesrv2"]

+ 10 - 0
sharesrv2/agollo.json

@@ -0,0 +1,10 @@
+{
+  "appId": "sharev2",
+  "cluster": "fish3",
+  "namespaceNames": [
+    "server.yaml"
+  ],
+  "ip": "10.28.74.159:8080",
+  "oneNamespaceMode": false,
+  "tagname": "yaml"
+}

BIN
sharesrv2/font/arialunicode.ttf


BIN
sharesrv2/font/micross.ttf


BIN
sharesrv2/font/msyh.ttc


BIN
sharesrv2/font/simhei.ttf


BIN
sharesrv2/font/simkai.ttf


BIN
sharesrv2/font/simsun.ttc


BIN
sharesrv2/font/times.ttf


+ 8 - 0
sharesrv2/push.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+release=$1
+
+[ ! -n "$release" ] && exit 1
+
+docker build -t registry-vpc.cn-beijing.aliyuncs.com/xinyue/sharesrv2:${release} .
+docker push registry-vpc.cn-beijing.aliyuncs.com/xinyue/sharesrv2:${release}

BIN
sharesrv2/sharesrv2