[HWORKS-484] Consecutive python uninstall commands uses incorrect tag (…

…logicalclocks#1322)
moritzmeister · Apr 4, 2023 · 3cd1dc2 · 3cd1dc2
1 parent 1464c02
commit 3cd1dc2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/hopsworks-common/src/main/java/io/hops/hopsworks/common/python/library/LibraryInstaller.java b/hopsworks-common/src/main/java/io/hops/hopsworks/common/python/library/LibraryInstaller.java
@@ -495,13 +495,15 @@ private void uninstallLibrary(CondaCommands cc)
 
     File baseDir = new File("/tmp/docker/" + cc.getProjectId().getName());
     baseDir.mkdirs();
+    Project project = projectFacade.findById(cc.getProjectId().getId()).orElseThrow(() -> new ProjectException(
+      RESTCodes.ProjectErrorCode.PROJECT_NOT_FOUND, Level.FINE, "projectId: " + cc.getProjectId().getId()));
     try {
       File dockerFile = new File(baseDir, "dockerFile_" + cc.getProjectId().getName());
       File home = new File(System.getProperty("user.home"));
       FileUtils.copyFileToDirectory(new File(home, ".condarc"), baseDir);
       FileUtils.copyDirectoryToDirectory(new File(home, ".pip"), baseDir);
       try (BufferedWriter writer = new BufferedWriter(new FileWriter(dockerFile))) {
-        writer.write("FROM " + projectUtils.getFullDockerImageName(cc.getProjectId(), false) + "\n");
+        writer.write("FROM " + projectUtils.getFullDockerImageName(project, false) + "\n");
         writer.newLine();
         writer.write(
             "RUN --mount=type=bind,source=.condarc,target=/root/.condarc"
@@ -519,9 +521,7 @@ private void uninstallLibrary(CondaCommands cc)
             throw new UnsupportedOperationException("install type unknown: " + cc.getInstallType());
         }
       }
-
-      Project project = projectFacade.findById(cc.getProjectId().getId()).orElseThrow(() -> new ProjectException(
-        RESTCodes.ProjectErrorCode.PROJECT_NOT_FOUND, Level.FINE, "projectId: " + cc.getProjectId().getId()));
+
       String nextDockerImageName = getNextDockerImageName(project);
 
       ProcessDescriptor processDescriptor = new ProcessDescriptor.Builder()