diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java index 87da6e30..d4be4c95 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java @@ -131,9 +131,8 @@ public class ImageController extends BaseController { @ApiOperation("从本地上传构建镜像") public GenericsAjaxResult> createImageFromLocal(@RequestParam("name") String imageName, @RequestParam("tag") String imageTag, - @RequestParam("path") String path, @RequestParam("fileName") String fileName) throws Exception { - return genericsSuccess(this.imageService.createImageFromLocal(imageName, imageTag, path, fileName)); + return genericsSuccess(this.imageService.createImageFromLocal(imageName, imageTag, fileName)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ImageService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ImageService.java index 113ef5ad..39b5ba53 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ImageService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ImageService.java @@ -86,7 +86,7 @@ public interface ImageService { * @param path * @return */ - Map createImageFromLocal(String imageName, String imageTag, String path,String fileName) throws Exception; + Map createImageFromLocal(String imageName, String imageTag,String fileName) throws Exception; Map createImageFromNet(String imageName, String imageTag, String NetPath) throws Exception; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java index 33b0e0a6..15810f79 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java @@ -268,10 +268,10 @@ public class ImageServiceImpl implements ImageService { if (imageVo.getUploadType() == 0) { resultMap = createImageFromNet(imageVo.getName(), imageVo.getTagName(), imageVo.getPath()); } else { - resultMap = createImageFromLocal(imageVo.getName(), imageVo.getTagName(), imageVo.getPath(), imageVo.getFileName()); + resultMap = createImageFromLocal(imageVo.getName(), imageVo.getTagName(), imageVo.getFileName()); } } catch (Exception e) { - imageVersion.setStatus("failed"); + imageVersion.setStatus(Constant.Failed); imageVersionService.update(imageVersion); throw new RuntimeException("镜像构建失败: " + e.getMessage(), e); } @@ -339,7 +339,7 @@ public class ImageServiceImpl implements ImageService { } @Override - public Map createImageFromLocal(String imageName, String imageTag, String path, String fileName) throws Exception { + public Map createImageFromLocal(String imageName, String imageTag, String fileName) throws Exception { Map resultMap = new HashMap<>(); // 得到容器 V1Pod pod = k8sClientUtil.getNSPodList(serviceNS, deploymentName); @@ -353,7 +353,7 @@ public class ImageServiceImpl implements ImageService { // 在这个容器的/data/admin 目录下执行命令 docker load -i fileName 得到返回的镜像名字name:tag String username = SecurityUtils.getLoginUser().getUsername(); // - String filePath = "/data/" + path + "/" + fileName; + String filePath = mountPath + "/" + username + "/" + fileName; String logs2 = k8sClientUtil.executeCommand(pod, "docker load -i " + filePath); // 在容器里执行 docker tag name:tag nexus3.kube-system.svc:8083/imageName:imageTag