1.8.0 ui

docker/run-all/docker-compose.yml

@@ -48,12 +48,12 @@ services:
       POSTGRES_DB: jetlinks
       TZ: Asia/Shanghai
   ui:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-antd:1.6.0
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-antd:1.8.0
     container_name: jetlinks-ce-ui
     ports:
       - 9000:80
     environment:
-      - "API_BASE_PATH=http://jetlinks:8848/" #API根路径
+      - "API_BASE_PATH=http://jetlinks:8848" #API根路径
     volumes:
       - "jetlinks-volume:/usr/share/nginx/html/upload"
     links:

docker/ui/Dockerfile

@@ -1,6 +0,0 @@
-FROM nginx
-ADD nginx.conf /etc/nginx/conf.d/default.conf
-
-
-CMD ["sh","docker-entrypoint.sh"]
-#ADD oauth2 /usr/share/nginx/html/oauth2

docker/ui/nginx/Dockerfile

@@ -1,6 +0,0 @@
-FROM nginx
-ADD nginx.conf /etc/nginx/conf.d/default.conf
-ADD docker-entrypoint.sh /docker-entrypoint.sh
-
-CMD ["sh","/docker-entrypoint.sh"]
-#ADD oauth2 /usr/share/nginx/html/oauth2

docker/ui/nginx/docker-entrypoint.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-API_BASE_PATH=$API_BASE_PATH;
-
-if [ -z "$API_BASE_PATH" ]; then
-    API_BASE_PATH="http://jetlinks:8844/";
-fi
-
-apiUrl="proxy_pass  $API_BASE_PATH;"
-
-sed -i '18c '"$apiUrl"'' /etc/nginx/conf.d/default.conf
-
-nginx -g "daemon off;"

docker/ui/nginx/nginx.conf

@@ -1,27 +0,0 @@
-server {
-    listen 80;
-    # gzip config
-    gzip on;
-    gzip_min_length 1k;
-    gzip_comp_level 9;
-    gzip_types text/plain text/css text/javascript application/json application/javascript application/x-javascript application/xml;
-    gzip_vary on;
-    gzip_disable "MSIE [1-6]\.";
-
-    root /usr/share/nginx/html;
-    include /etc/nginx/mime.types;
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    location ^~/api/ {
-        proxy_pass http://jetlinks:8844/;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Host $host:$server_port;
-        proxy_set_header X-Real-IP  $remote_addr;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        client_max_body_size  50m;
-    }
-}