docker-problem (#31)

Author: ljn55966005

README.md

@@ -42,4 +42,19 @@ IoTDB-Workbench是IoTDB的可视化管理工具，可对IoTDB的数据进行增
 
 ## Docker
 
-`docker-compose up -d`
+1、构建镜像:将前后后端分别打包构建出target和dist目录，然后在对应的目录下执行命令(当docker hub 有下面镜像时可以省去构建镜像步骤)
+
+```shell script
+  cd bacnkend
+  docker build -t apache/iotdb-web-workbench:0.13.0-backend .
+  cd frontend
+  docker build -t apache/iotdb-web-frontend:0.13.0-frontend .
+```
+
+2、将backend/resources/sqlite目录下的iotdb拷贝到你需要挂载的路径，如/data/iotdb.db
+
+3、在根目录下执行
+
+`docker-compose up -d`
+
+> 注意 docker-compose.yml中volumes挂载路径为步骤2中所指定路径；PORTS和你后端端口的值一样。

backend/Dockerfile

@@ -16,14 +16,14 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+FROM  openjdk:8-jdk-oracle
 
+ENV JAVA_MEM_OPTS="-Xmx1024m -Xms1024m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m"
 
+COPY  target/*.jar /app/app.jar
 
+RUN mkdir /data
 
-FROM openjdk:8-jdk-oracle
+EXPOSE 9090
 
-COPY --from=builder /app/target/workbench-1.0.0.jar /app/workbench-1.0.0.jar
-
-EXPOSE 8080
-
-ENTRYPOINT ["java", "-jar", "/app/workbench-1.0.0.jar"]
+ENTRYPOINT ["java", "-jar", "${JAVA_MEM_OPTS}","/app/app.jar"]

backend/src/main/java/org/apache/iotdb/admin/mapper/ViewModeMapper.java

@@ -23,6 +23,5 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Component;
 
-
 @Component
 public interface ViewModeMapper extends BaseMapper<ViewMode> {}

backend/src/main/java/org/apache/iotdb/admin/model/dto/QueryInfoDTO.java

@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-
 @Data
 public class QueryInfoDTO {
   private Long latestRunningTime;

backend/src/main/java/org/apache/iotdb/admin/model/vo/MetricsConnectionVO.java

@@ -22,7 +22,6 @@
 
 import java.io.Serializable;
 
-
 @Data
 public class MetricsConnectionVO implements Serializable {
   Integer id;

backend/src/main/java/org/apache/iotdb/admin/model/vo/MetricsListDataVO.java

@@ -22,7 +22,6 @@
 
 import java.io.Serializable;
 
-
 @Data
 public class MetricsListDataVO implements Serializable {
   private String name;

backend/src/main/java/org/apache/iotdb/admin/model/vo/QueryClassificationVO.java

@@ -20,7 +20,6 @@
 
 import lombok.Data;
 
-
 @Data
 public class QueryClassificationVO {
   private Integer id;

backend/src/main/java/org/apache/iotdb/admin/service/impl/MetricsServiceImpl.java

@@ -1559,13 +1559,19 @@ public List<MetricsListDataVO> getMemMetricsDataList(Connection connection) thro
   public List<MetricsListDataVO> getDiskMetricsDataList(Connection connection)
       throws BaseException {
     List<MetricsListDataVO> list = new ArrayList<>();
-    list.add(getDiskTotalSize(connection));
-    list.add(getDiskLoadSize(connection));
-    list.add(getDiskAvailableSize(connection));
-    list.add(getDiskIO(connection));
-    list.add(getWalFileCountAndSize(connection));
-    list.add(getSeqTSFileCountAndSize(connection));
-    list.add(getUnSeqTSFileCountAndSize(connection));
+
+    try {
+      list.add(getDiskTotalSize(connection));
+      list.add(getDiskLoadSize(connection));
+      list.add(getDiskAvailableSize(connection));
+      list.add(getDiskIO(connection));
+      list.add(getWalFileCountAndSize(connection));
+      list.add(getSeqTSFileCountAndSize(connection));
+    } catch (Exception e) {
+      e.printStackTrace();
+      return list;
+    }
+
     return list;
   }
 

backend/src/main/resources/sqlite/iotdb.db

@@ -17,19 +17,22 @@
 # under the License.
 #
 
+
 version: "3.8"
 
 services:
   backend:
-    build: ./backend
+    image: apache/iotdb-web-workbench:0.13.0-backend
     restart: always
-    ports:
-      - 8081:8080
+    volumes:
+      - /data/iotdb.db:/data/iotdb.db #数据库挂载前面为本地路径
 
   frontend:
-    build: ./frontend
+    image: apache/iotdb-web-workbench:0.13.0-frontend
     restart: always
     ports:
-      - 8080:8080
+      - 8081:80  #访问端口
+    environment:
+      - BACKEND_ADDRESS=backend:9090  #后端启动端口
     depends_on:
       - backend