Merge branch 'feature/nginx-config' of duanxiaoduan/tmr-admin into release/v1.0.2

.drone.yml

@@ -1,19 +1,19 @@
 kind: pipeline
 type: docker
-name: tmp-admin
+name: test
 
-clone:
-  depth: 1
-  disable: true
+#clone:
+#  depth: 1
+#  disable: true
 
 steps:
-  - name: clone
-    image: alpine/git
-    commands:
-      - git config --global credential.helper store
-      - git clone -b develop http://192.168.1.8:3000/duanxiaoduan/tmr-admin.git
-      - cp -R tmr-admin/* ./
-      - ls -l
+  #- name: clone
+  #  image: alpine/git
+  #  commands:
+  #    - git config --global credential.helper store
+  #    - git clone -b develop http://192.168.1.8:3000/duanxiaoduan/tmr-admin.git
+  #    - cp -R tmr-admin/* ./
+  #    - ls -l
   - name: build
     image: plugins/docker
     volumes:
@@ -31,16 +31,14 @@ steps:
         from_secret: aliyun_password
       repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
       registry: registry.cn-hangzhou.aliyuncs.com
-      tags: [1.0.0,latest]
-
+      tags: [test]
 trigger:
   branch:
     include:
-      - develop
+      - feature/*
   event:
     include:
       - push
-
 volumes:
   - name: host
     host:
@@ -51,3 +49,79 @@ volumes:
   - name: docker-sock
     host:
       path: /var/run/docker.sock
+---
+kind: pipeline
+type: docker
+name: product
+steps:
+  - name: build
+    image: plugins/docker:20.14.2
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      username:
+        from_secret: aliyun_name
+      password:
+        from_secret: aliyun_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tag:
+        - latest
+        - ${DRONE_BRANCH##release/}
+trigger:
+  branch:
+    include:
+      - release/*
+  event:
+    include:
+      - push
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock
+---
+kind: pipeline
+type: docker
+name: hotfix
+
+steps:
+  - name: build
+    image: plugins/docker:20.14.2
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      username:
+        from_secret: aliyun_name
+      password:
+        from_secret: aliyun_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/tmr-admin
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tag:
+        - latest
+trigger:
+  branch:
+    include:
+      - hotfix/*
+  event:
+    include:
+      - push
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock

default.conf.template

@@ -1,54 +1,32 @@
 server {
-    listen       80;
-    listen  [::]:80;
-    server_name  localhost;
+   listen       80;
+   listen  [::]:80;
+   server_name  localhost;
+
+   access_log  /var/log/nginx/host.access.log  main;
+
+   gzip on;
+   gzip_disable "msie6";
+   gzip_vary on;
+   gzip_proxied any;
+   gzip_comp_level 6;
+   gzip_buffers 16 8k;
+   gzip_http_version 1.1;
+   gzip_types text/plain application/css text/css application/xml text/javascript application/javascript application/x-javascript;
 
-    #access_log  /var/log/nginx/host.access.log  main;
 
    location / {
         root /usr/share/nginx/html;
         #index index.html;
         try_files $uri $uri/ /index.html;
    }
-    #error_page  404              /404.html;
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-
-    # location /prod-api/ {
-    #    proxy_pass  ${BACKEND_HOST};
-    #    proxy_set_header Host $host;
-    #    proxy_set_header X-Real-IP $remote_addr;
-    #    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    #    proxy_http_version 1.1;
-    #    proxy_set_header Connection "";
-    #}
+   #error_page  404              /404.html;
 
-    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-    #
-    #location ~ \.php$ {
-    #    proxy_pass   http://127.0.0.1;
-    #}
-
-    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-    #
-    #location ~ \.php$ {
-    #    root           html;
-    #    fastcgi_pass   127.0.0.1:9000;
-    #    fastcgi_index  index.php;
-    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-    #    include        fastcgi_params;
-    #}
+   # redirect server error pages to the static page /50x.html
+   #
+   error_page   500 502 503 504  /50x.html;
+   location = /50x.html {
+      root   /usr/share/nginx/html;
+   }
 
-    # deny access to .htaccess files, if Apache's document root
-    # concurs with nginx's one
-    #
-    #location ~ /\.ht {
-    #    deny  all;
-    #}
 }
-