add docker

docker/run-all/docker-compose.yml

@@ -2,9 +2,9 @@ version: '2'
 services:
   redis:
     image: redis:5.0.4
-    container_name: jetlinks-redis
-    ports:
-      - "6379:6379"
+    container_name: jetlinks-ce-redis
+#    ports:
+#      - "6379:6379"
     volumes:
       - "./data/redis:/data"
     command: redis-server --appendonly yes
@@ -12,7 +12,7 @@ services:
       - TZ=Asia/Shanghai
   elasticsearch:
     image: elasticsearch:6.7.2
-    container_name: jetlinks-elasticsearch
+    container_name: jetlinks-ce-elasticsearch
     environment:
       ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
       transport.host: 0.0.0.0
@@ -20,37 +20,48 @@ services:
       bootstrap.memory_lock: "true"
       discovery.zen.minimum_master_nodes: 1
       discovery.zen.ping.unicast.hosts: elasticsearch
-    ports:
-      - "9200:9200"
-      - "9300:9300"
+#    ports:
+#      - "9200:9200"
+#      - "9300:9300"
   kibana:
     image: kibana:6.7.2
-    container_name: jetlinks-kibana
+    container_name: jetlinks-ce-kibana
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200
     links:
       - elasticsearch:elasticsearch
-    ports:
-      - "5601:5601"
+#    ports:
+#      - "5601:5601"
     depends_on:
       - elasticsearch
   postgres:
     image: postgres:11-alpine
-    container_name: jetlinks-postgres
-    ports:
-      - "5432:5432"
+    container_name: jetlinks-ce-postgres
+#    ports:
+#      - "5432:5432"
     volumes:
       - "./data/postgres:/var/lib/postgresql/data"
     environment:
       POSTGRES_PASSWORD: jetlinks
       POSTGRES_DB: jetlinks
       TZ: Asia/Shanghai
-  jetlinks:
-    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-community
-    container_name: jetlinks-pro
+  ui:
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-antd
+    container_name: jetlinks-ce-ui
     ports:
-      - 8844:8844 # API端口
-      - 1884:1883 # MQTT端口
+      - 9000:80
+    environment:
+      - "API_BASE_PATH=http://jetlinks:8848/" #API根路径
+    volumes:
+      - "./data/upload:/usr/share/nginx/html/upload"
+    links:
+      - jetlinks:jetlinks
+  jetlinks:
+    image: registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone
+    container_name: jetlinks-ce
+    ports:
+      - 9010:8848 # API端口
+      - 1883:1883 # MQTT端口
       - 8000:8000 # 预留
       - 8001:8001 # 预留
       - 8002:8002 # 预留

docker/ui/Dockerfile

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,13 @@
+#!/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

@@ -0,0 +1,27 @@
+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;
+    }
+}