Fixed build steps

exasol · Dec 6, 2024 · ef97fc2 · ef97fc2
1 parent eacd04b
commit ef97fc2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/build_steps.py b/flavors/test-Exasol-8-cuda-ml/flavor_base/build_steps.py
@@ -122,7 +122,8 @@ def get_build_step(self) -> str:
         return "flavor_test_build_run"
 
     def requires_tasks(self):
-        return {"base_test_build_run": AnalyzeBaseTestBuildRun}
+        return {"base_test_build_run": AnalyzeBaseTestBuildRun,
+                "flavor_base_deps": AnalyzeFlavorBaseDeps}
 
     def get_path_in_flavor(self):
         return "flavor_base"
@@ -134,7 +135,8 @@ def get_build_step(self) -> str:
 
     def requires_tasks(self):
         return {"build_run": AnalyzeBuildRun,
-                "language_deps": AnalyzeLanguageDeps}
+                "language_deps": AnalyzeLanguageDeps,
+                "flavor_base_deps": AnalyzeFlavorBaseDeps}
 
     def get_path_in_flavor(self):
         return "flavor_base"

diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/flavor_test_build_run/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/flavor_test_build_run/Dockerfile
@@ -2,22 +2,22 @@ FROM {{base_test_build_run}}
 
 RUN mkdir -p /conf /buckets
 
-COPY --from={{flavor_customization}} /usr /usr
+COPY --from={{flavor_base_deps}} /usr /usr
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /opt /opt
+COPY --from={{flavor_base_deps}} /opt /opt
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /lib /lib
+COPY --from={{flavor_base_deps}} /lib /lib
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /bin /bin
+COPY --from={{flavor_base_deps}} /bin /bin
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /etc /etc
+COPY --from={{flavor_base_deps}} /etc /etc
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /build_info /build_info
+COPY --from={{flavor_base_deps}} /build_info /build_info
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
 

diff --git a/flavors/test-Exasol-8-cuda-ml/flavor_base/release/Dockerfile b/flavors/test-Exasol-8-cuda-ml/flavor_base/release/Dockerfile
@@ -31,28 +31,28 @@ COPY --from={{language_deps}} /scripts /scripts
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
 
-COPY --from={{flavor_customization}} /usr /usr
+COPY --from={{flavor_base_deps}} /usr /usr
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /lib /lib
+COPY --from={{flavor_base_deps}} /lib /lib
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /bin /bin
+COPY --from={{flavor_base_deps}} /bin /bin
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /opt /opt
+COPY --from={{flavor_base_deps}} /opt /opt
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /etc /etc
+COPY --from={{flavor_base_deps}} /etc /etc
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /build_info /build_info
+COPY --from={{flavor_base_deps}} /build_info /build_info
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /var /var
+COPY --from={{flavor_base_deps}} /var /var
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
-COPY --from={{flavor_customization}} /root /root
+COPY --from={{flavor_base_deps}} /root /root
 RUN true # workaround for https://github.com/moby/moby/issues/37965
 
 RUN ldconfig