Forráskód Böngészése

完善docker-compose

regan 2 éve
szülő
commit
ff3579dbb1
2 módosított fájl, 13 hozzáadás és 41 törlés
  1. 1 1
      Dockerfile
  2. 12 40
      docker-compose/docker-compose.yml

+ 1 - 1
Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:11-jre-slim
 WORKDIR /app
 ADD iot-standalone/target/iot-standalone-0.3.2-SNAPSHOT.tar /app/
-ADD /data /app/
+ADD /data /app/data/
 EXPOSE 8086
 ENTRYPOINT ["java", "-classpath", ".:lib/*","cc.iotkit.manager.Application"]

+ 12 - 40
docker-compose/docker-compose.yml

@@ -3,13 +3,9 @@ services:
   redis:
     image: redis:latest
     container_name: iotkit-ce-redis
-      ports:
-        - 6379:6379
-    volumes:
-      - redis-volume:/data
-    command: redis-server --appendonly yes --requirepass
-    environment:
-      - TZ=Asia/Shanghai
+    ports:
+      - 6379:6379
+    command: redis-server --appendonly yes
   elasticsearch:
     image: elasticsearch:7.12.0
     container_name: iotkit-ce-elasticsearch
@@ -18,51 +14,27 @@ services:
       transport.host: 0.0.0.0
       discovery.type: single-node
       bootstrap.memory_lock: "true"
-      discovery.zen.minimum_master_nodes: 1
-      discovery.zen.ping.unicast.hosts: elasticsearch
-    volumes:
-      - elasticsearch-volume:/usr/share/elasticsearch/data
-      ports:
-        - 9200:9200
-        - 9300:9300
+    ports:
+      - 9200:9200
+      - 9300:9300
   ui:
-    image: 填写前端镜像
+    image: uncleregan/iotkit-ui:0.3.4
     container_name: iotkit-ce-ui
     ports:
-      - 9001:80
-    environment:
-      - VUE_APP_API_URL=http://iotkit:8086/ #API根路径
-      - VUE_APP_AUTH_URL=http://iotkit:8086/oauth2 #权限认证
-    volumes:
-      - iotkit-volume:/usr/share/nginx/html/upload
+      - 80:80
     links:
       - iotkit:iotkit
   iotkit:
-    image: 填写后端镜像
-    container_name: iotkit-ce
+    image: uncleregan/iotkit:0.3.3
+    container_name: iotkit-cei
+    restart: on-failure
     ports:
       - 8086:8086 # API端口
       - 1883-1890:1883-1890 # 预留
       - 8000-8010:8000-8010 # 预留
-    volumes:
-      - iotkit-volume:/app  # 服务根路径
-    environment:
-      - JAVA_OPTS=-Duser.language=zh -XX:+UseG1GC
-      - TZ=Asia/Shanghai
-      - spring.redis.host=redis
-      - spring.redis.port=6379
-      #- spring.redis.password=password
-      - spring.elasticsearch.rest.uris=http://elasticsearch:9200
-      #- spring.elasticsearch.resr.username=admin
-      #- spring.elasticsearch.resr.password=admin
-      - spring.elasticsearch..rest.connection-timeout=10s
     links:
       - redis:redis
       - elasticsearch:elasticsearch
     depends_on:
-      - redis
       - elasticsearch
-volumes:
-  redis-volume:
-  elasticsearch-volume:
-  iotkit-volume:
+      - redis