Jelajahi Sumber

开发完成, 通过 websocket 来管理 agent 节点上的 docker 容器和镜像, Docker.vue 中对 docker 的操作基于 websocket , 完全异步

reghao 3 bulan lalu
induk
melakukan
419fbf1554
2 mengubah file dengan 4 tambahan dan 57 penghapusan
  1. 0 17
      src/api/devops.js
  2. 4 40
      src/views/devops/machine/Docker.vue

+ 0 - 17
src/api/devops.js

@@ -7,7 +7,6 @@ const devopsApi = {
   eraseBuildDir: '/api/devops/build/dir/erase',
   getMachineList: '/api/devops/machine/host',
   getAliyunKeyList: '/api/devops/machine/aliyun/key',
-  getDockerList: '/api/devops/machine/docker',
   getEnvList: '/api/devops/envs',
   getAppTypeList: '/api/devops/app_types',
   getCompilerList: '/api/devops/build/compiler',
@@ -81,22 +80,6 @@ export function getAliyunKeyList() {
   return get(devopsApi.getAliyunKeyList)
 }
 
-export function getDockerImageList(queryInfo) {
-  return get(devopsApi.getDockerList + '/image/list', queryInfo)
-}
-
-export function deleteDockerImages(formData) {
-  return postForm(devopsApi.getDockerList + '/image/delete', formData)
-}
-
-export function getDockerContainerList() {
-  return get(devopsApi.getDockerList + '/container/list')
-}
-
-export function handleDockerContainer(formData) {
-  return postForm(devopsApi.getDockerList + '/container/ops', formData)
-}
-
 export function getEnvList() {
   return get(devopsApi.getEnvList)
 }

+ 4 - 40
src/views/devops/machine/Docker.vue

@@ -178,22 +178,9 @@ export default {
     }).catch(error => {
       this.$message.error(error.message)
     })
-    // this.getData()
     this.initWebSocket()
   },
   methods: {
-    getData() {
-      this.dataList = []
-      getDockerContainerList().then(resp => {
-        if (resp.code === 0) {
-          this.dataList = resp.data
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(error => {
-        this.$message.error(error.message)
-      })
-    },
     getMachineList(env) {
       getMachineSessions(env).then(resp => {
         if (resp.code === 0) {
@@ -240,12 +227,6 @@ export default {
         jsonPayload.ops = 'imageRm'
         jsonPayload.payload = imageIds
         this.sendMessage(JSON.stringify(jsonPayload))
-        /* deleteDockerImages(formData).then(resp => {
-          this.$message.info(resp.msg)
-          this.onGetImages()
-        }).catch(error => {
-          this.$message.error(error.message)
-        })*/
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -263,17 +244,13 @@ export default {
         formData.append('opsType', 3)
         formData.append('containerId', row.containerId)
 
+        const containerIds = []
+        containerIds.push(row.containerId)
         const jsonPayload = {}
         jsonPayload.machineId = this.machine
         jsonPayload.ops = 'containerRm'
-        jsonPayload.payload = row.containerId
+        jsonPayload.payload = containerIds
         this.sendMessage(JSON.stringify(jsonPayload))
-        /* handleDockerContainer(formData).then(resp => {
-          this.$message.info(resp.msg)
-          this.getData()
-        }).catch(error => {
-          this.$message.error(error.message)
-        })*/
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -282,7 +259,6 @@ export default {
       })
     },
     onRefresh() {
-      // this.getData()
       const jsonPayload = {}
       jsonPayload.machineId = this.machine
       jsonPayload.ops = 'containerList'
@@ -292,21 +268,9 @@ export default {
       const jsonPayload = {}
       jsonPayload.machineId = this.machine
       jsonPayload.ops = 'imageList'
-      jsonPayload.payload = this.queryInfo
+      jsonPayload.dockerQuery = this.queryInfo
       this.sendMessage(JSON.stringify(jsonPayload))
       this.showImageDialog = true
-
-      /* this.dataList1 = []
-      getDockerImageList(this.queryInfo).then(resp => {
-        if (resp.code === 0) {
-          this.dataList1 = resp.data
-          this.showImageDialog = true
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(error => {
-        this.$message.error(error.message)
-      })*/
     },
     onSelectChange() {
       this.machine = ''