From 73bf6677504449e33774b21c935f83ed24af2769 Mon Sep 17 00:00:00 2001 From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com> Date: Tue, 14 May 2024 15:22:33 -0300 Subject: [PATCH] #889: Upgraded all python template flavors (#407) related to https://github.com/exasol/script-languages-release/issues/889 --- aws-code-build/ci/buildspec.yaml | 15 +- .../FLAVOR_DESCRIPTION.md | 14 -- .../base_test_build_run/Dockerfile | 39 ----- .../base_test_deps/packages/apt_get_packages | 6 - .../flavor_base/build_deps/Dockerfile | 37 ----- .../build_deps/packages/apt_get_packages | 9 -- .../flavor_base/build_run/Dockerfile | 41 ----- .../flavor_base/build_steps.py | 147 ------------------ .../flavor_base/flavor_base_deps/Dockerfile | 8 - .../packages/apt_get_packages | 4 - .../flavor_base/language_deps/Dockerfile | 15 -- .../language_deps/packages/apt_get_packages | 5 - .../packages/python3_pip_packages | 3 - .../flavor_base/release/Dockerfile | 62 -------- .../flavor_base/security_scan/.trivyignore | 37 ----- .../flavor_base/udfclient_deps/Dockerfile | 26 ---- .../udfclient_deps/packages/apt_get_packages | 6 - .../flavor_customization/Dockerfile | 77 --------- .../packages/apt_get_packages | 9 -- .../FLAVOR_DESCRIPTION.md | 0 .../base_test_build_run/Dockerfile | 0 .../flavor_base/base_test_deps/Dockerfile | 0 .../base_test_deps/packages/apt_get_packages | 6 + .../flavor_base/build_deps/Dockerfile | 0 .../build_deps/packages/conda_channels | 0 .../build_deps/packages/conda_packages | 2 +- .../flavor_base/build_run/Dockerfile | 0 .../flavor_base/build_steps.py | 0 .../flavor_base/conda_deps/Dockerfile | 2 +- .../conda_deps/_activate_current_env.sh | 0 .../conda_deps/packages/apt_get_packages | 5 + .../flavor_base/derived_from | 0 .../flavor_base/flavor_base_deps/Dockerfile | 0 .../flavor_base_deps/packages/conda_channels | 0 .../flavor_base_deps/packages/conda_packages | 0 .../packages/python3_pip_packages | 0 .../flavor_test_build_run/Dockerfile | 0 .../flavor_base/language_definition | 0 .../flavor_base/language_deps/Dockerfile | 2 +- .../language_deps/packages/conda_channels | 0 .../language_deps/packages/conda_packages | 12 +- .../flavor_base/release/Dockerfile | 4 +- .../flavor_base/security_scan/.trivyignore | 0 .../flavor_base/security_scan/Dockerfile | 0 .../security_scan/packages/apt_get_packages | 0 .../packages/apt_get_packages_trivy_deps | 0 .../flavor_base/testconfig | 0 .../flavor_base/udfclient_deps/Dockerfile | 0 .../udfclient_deps/packages/conda_channels | 0 .../udfclient_deps/packages/conda_packages | 10 +- .../flavor_customization/Dockerfile | 0 .../packages/conda_channels | 0 .../packages/conda_packages | 0 .../packages/python3_pip_packages | 0 .../FLAVOR_DESCRIPTION.md | 0 .../base_test_build_run/Dockerfile | 0 .../flavor_base/base_test_deps/Dockerfile | 0 .../base_test_deps/packages/apt_get_packages | 6 + .../flavor_base/build_deps/Dockerfile | 0 .../build_deps/packages/conda_channels | 0 .../build_deps/packages/conda_packages | 6 +- .../flavor_base/build_run/Dockerfile | 0 .../flavor_base/build_steps.py | 0 .../flavor_base/conda_deps/Dockerfile | 0 .../conda_deps/_activate_current_env.sh | 0 .../flavor_base/derived_from | 0 .../flavor_base/flavor_base_deps/Dockerfile | 2 - .../flavor_base_deps/packages/conda_channels | 0 .../flavor_base_deps/packages/conda_packages | 1 + .../packages/python3_pip_packages | 0 .../flavor_test_build_run/Dockerfile | 0 .../flavor_base/language_definition | 0 .../flavor_base/language_deps/Dockerfile | 4 +- .../language_deps}/packages/conda_channels | 1 + .../language_deps/packages/conda_packages | 14 +- .../flavor_base/nvidia_driver_deps/Dockerfile | 4 +- .../packages/apt_get_packages | 5 + .../flavor_base/release/Dockerfile | 4 +- .../flavor_base/security_scan/.trivyignore | 0 .../flavor_base/security_scan/Dockerfile | 0 .../security_scan/packages/apt_get_packages | 0 .../packages/apt_get_packages_trivy_deps | 0 .../flavor_base/testconfig | 0 .../flavor_base/udfclient_deps/Dockerfile | 0 .../udfclient_deps}/packages/conda_channels | 0 .../udfclient_deps/packages/conda_packages | 10 +- .../flavor_customization/Dockerfile | 0 .../packages/conda_channels | 0 .../packages/conda_packages | 0 .../packages/python3_pip_packages | 0 .../base_test_deps/packages/apt_get_packages | 4 - .../conda_deps/packages/apt_get_packages | 4 - .../flavor_base/base_test_deps/Dockerfile | 6 - .../base_test_deps/packages/apt_get_packages | 4 - .../flavor_base_deps/packages/conda_packages | 2 - .../packages/python3_pip_packages | 0 .../flavor_test_build_run/Dockerfile | 25 --- .../flavor_base/language_definition | 1 - .../packages/apt_get_packages | 4 - .../flavor_base/security_scan/Dockerfile | 14 -- .../security_scan/packages/apt_get_packages | 1 - .../packages/apt_get_packages_trivy_deps | 2 - .../flavor_base/testconfig | 2 - .../packages/python3_pip_packages | 9 -- 104 files changed, 67 insertions(+), 671 deletions(-) delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/FLAVOR_DESCRIPTION.md delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_build_run/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_deps/packages/apt_get_packages delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_run/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_steps.py delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/python3_pip_packages delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/release/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/.trivyignore delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/Dockerfile delete mode 100644 flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/packages/apt_get_packages rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/FLAVOR_DESCRIPTION.md (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/base_test_build_run/Dockerfile (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/base_test_deps/Dockerfile (100%) create mode 100644 flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_deps/packages/apt_get_packages rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/build_deps/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/build_deps/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/build_deps/packages/conda_packages (86%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/build_run/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/build_steps.py (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/conda_deps/Dockerfile (98%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/conda_deps/_activate_current_env.sh (100%) create mode 100644 flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/derived_from (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/flavor_base_deps/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/flavor_base_deps/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/flavor_base_deps/packages/conda_packages (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/flavor_base_deps/packages/python3_pip_packages (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/flavor_test_build_run/Dockerfile (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/language_definition (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/language_deps/Dockerfile (92%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/language_deps/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/language_deps/packages/conda_packages (79%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-conda}/flavor_base/release/Dockerfile (95%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/security_scan/.trivyignore (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/security_scan/Dockerfile (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/security_scan/packages/apt_get_packages (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/security_scan/packages/apt_get_packages_trivy_deps (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_base/testconfig (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/udfclient_deps/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_base/udfclient_deps/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-conda}/flavor_base/udfclient_deps/packages/conda_packages (65%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_customization/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_customization/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-conda}/flavor_customization/packages/conda_packages (100%) rename flavors/{python-3.8-minimal-EXASOL-6.2.0 => template-Exasol-all-python-3.10-conda}/flavor_customization/packages/python3_pip_packages (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/FLAVOR_DESCRIPTION.md (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/base_test_build_run/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/base_test_deps/Dockerfile (100%) create mode 100644 flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/build_deps/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/build_deps/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/build_deps/packages/conda_packages (51%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/build_run/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/build_steps.py (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/conda_deps/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/conda_deps/_activate_current_env.sh (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/derived_from (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/flavor_base_deps/Dockerfile (95%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/flavor_base_deps/packages/conda_channels (100%) create mode 100644 flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/flavor_base_deps/packages/python3_pip_packages (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/flavor_test_build_run/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/language_definition (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/language_deps/Dockerfile (86%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda/flavor_customization => template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps}/packages/conda_channels (66%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/language_deps/packages/conda_packages (71%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/nvidia_driver_deps/Dockerfile (92%) create mode 100644 flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/release/Dockerfile (95%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/security_scan/.trivyignore (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/security_scan/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/security_scan/packages/apt_get_packages (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/security_scan/packages/apt_get_packages_trivy_deps (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/testconfig (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/udfclient_deps/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps => template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps}/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_base/udfclient_deps/packages/conda_packages (65%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_customization/Dockerfile (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps => template-Exasol-all-python-3.10-cuda-conda/flavor_customization}/packages/conda_channels (100%) rename flavors/{template-Exasol-all-python-3.8-cuda-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_customization/packages/conda_packages (100%) rename flavors/{template-Exasol-all-python-3.8-conda => template-Exasol-all-python-3.10-cuda-conda}/flavor_customization/packages/python3_pip_packages (100%) delete mode 100644 flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_deps/packages/apt_get_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/Dockerfile delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_test_build_run/Dockerfile delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_definition delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/Dockerfile delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/testconfig delete mode 100644 flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/python3_pip_packages diff --git a/aws-code-build/ci/buildspec.yaml b/aws-code-build/ci/buildspec.yaml index 6515d135d..39c8929cf 100644 --- a/aws-code-build/ci/buildspec.yaml +++ b/aws-code-build/ci/buildspec.yaml @@ -6,13 +6,6 @@ version: 0.2 batch: fast-fail: false build-graph: - - identifier: build_python_38_minimal_EXASOL_620 - env: - variables: - FLAVOR: python-3.8-minimal-EXASOL-6.2.0 - compute-type: BUILD_GENERAL1_MEDIUM - privileged-mode: true - buildspec: ./aws-code-build/ci/build_buildspec.yaml - identifier: build_template_Exasol_all_python_310 env: variables: @@ -20,17 +13,17 @@ batch: compute-type: BUILD_GENERAL1_MEDIUM privileged-mode: true buildspec: ./aws-code-build/ci/build_buildspec.yaml - - identifier: build_template_Exasol_all_python_38_conda + - identifier: build_template_Exasol_all_python_310_conda env: variables: - FLAVOR: template-Exasol-all-python-3.8-conda + FLAVOR: template-Exasol-all-python-3.10-conda compute-type: BUILD_GENERAL1_MEDIUM privileged-mode: true buildspec: ./aws-code-build/ci/build_buildspec.yaml - - identifier: build_template_Exasol_all_python_38_cuda_conda + - identifier: build_template_Exasol_all_python_310_cuda_conda env: variables: - FLAVOR: template-Exasol-all-python-3.8-cuda-conda + FLAVOR: template-Exasol-all-python-3.10-cuda-conda compute-type: BUILD_GENERAL1_MEDIUM privileged-mode: true buildspec: ./aws-code-build/ci/build_buildspec.yaml diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/FLAVOR_DESCRIPTION.md b/flavors/python-3.8-minimal-EXASOL-6.2.0/FLAVOR_DESCRIPTION.md deleted file mode 100644 index 1b0d791af..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/FLAVOR_DESCRIPTION.md +++ /dev/null @@ -1,14 +0,0 @@ -# Details for Python-3.8-minimal-EXASOL-6.2.0 flavor - -## Packages - -**Remarks:** The packages are grouped by there main usage and their type. - -- [UDFclient dependencies](flavor_base/udfclient_deps/packages/apt_get_packages) -- [Language dependencies](flavor_base/language_deps/packages/apt_get_packages) -- Flavor packages - - [Ubuntu packages](flavor_base/flavor_base_deps/packages/apt_get_packages) - - [Python3 pip packages](flavor_base/flavor_base_deps/packages/python3_pip_packages) -- Customization - - [Ubuntu packages](flavor_customization/packages/apt_get_packages) - - [Python3 pip packages](flavor_customization/packages/python3_pip_packages) diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_build_run/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_build_run/Dockerfile deleted file mode 100644 index 66ee9bdfd..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_build_run/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM {{language_deps}} - -RUN mkdir /conf /buckets - -COPY --from={{base_test_deps}} /usr /usr -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{base_test_deps}} /lib /lib -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{base_test_deps}} /bin /bin -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{base_test_deps}} /opt /opt -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{base_test_deps}} /etc /etc -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{base_test_deps}} /env /env -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -RUN ldconfig - -RUN mkdir /exaudfclient /exaudf -COPY /exaudfclient/base /exaudfclient/base - -WORKDIR /exaudfclient/base -RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty -c dbg --config python --config test-binaries-py3"] -RUN cp -r -L bazel-bin/* /exaudf -RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 -RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static - -WORKDIR / -RUN mkdir /exasol_emulator -COPY emulator/ /exasol_emulator -COPY /exaudfclient/base/exaudflib/zmqcontainer.proto /exasol_emulator -RUN cd /exasol_emulator && protoc zmqcontainer.proto --python_out=. diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_deps/packages/apt_get_packages deleted file mode 100644 index 843906f52..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_deps/packages/apt_get_packages +++ /dev/null @@ -1,6 +0,0 @@ -gdb|9.2-0ubuntu1~20.04.1 -valgrind|1:3.15.0-1ubuntu9.1 -gdbserver|9.2-0ubuntu1~20.04.1 -binutils|2.34-6ubuntu1.9 -patchelf|0.10-2build1 -strace|5.5-3ubuntu1 diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/Dockerfile deleted file mode 100644 index 34568a9d0..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM ubuntu:20.04 -ENV DEBIAN_FRONTEND=noninteractive - -ENV ARCHIVE_UBUNTU_PREFIX="" -RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1$ARCHIVE_UBUNTU_PREFIX\2/" /etc/apt/sources.list - -COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc -COPY scripts /scripts - -RUN mkdir -p /build_info/packages -COPY build_deps/packages /build_info/packages/build_deps - -ENV BAZEL_PACKAGE_VERSION="5.2.0" -ENV BAZEL_PACKAGE_FILE="bazel_$BAZEL_PACKAGE_VERSION-linux-x86_64.deb" -ENV BAZEL_PACKAGE_URL="https://github.com/bazelbuild/bazel/releases/download/$BAZEL_PACKAGE_VERSION/$BAZEL_PACKAGE_FILE" - -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/build_deps/apt_get_packages - -RUN apt-get -y update && \ - curl -L --output "$BAZEL_PACKAGE_FILE" "$BAZEL_PACKAGE_URL" && \ - apt-get install -y "./$BAZEL_PACKAGE_FILE" && \ - rm "$BAZEL_PACKAGE_FILE" && \ - apt-get -y clean && \ - apt-get -y autoremove - -RUN curl -L -o swig-2.0.4.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/swig-2.0.4.tar.gz && \ - tar zxf swig-2.0.4.tar.gz && \ - (cd swig-2.0.4 && ./configure --prefix=/usr && make && make install) && \ - rm -rf swig-2.0.4 swig-2.0.4.tar.gz - -RUN locale-gen en_US.UTF-8 && \ - update-locale LC_ALL=en_US.UTF-8 && \ - ldconfig - -RUN touch /env && \ - echo "export PROTOBUF_BIN=/usr/bin/protoc" >> /env && \ - echo "export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64" >> /env diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages deleted file mode 100644 index 5dae84572..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_deps/packages/apt_get_packages +++ /dev/null @@ -1,9 +0,0 @@ -coreutils|8.28-1ubuntu1 -locales|2.31-0ubuntu9.15 -tar|1.29b-2ubuntu0.4 -curl|7.68.0-1ubuntu2.22 -openjdk-11-jdk|11.0.19+7~us1-0ubuntu1~20.04.1 -build-essential|12.4ubuntu1 -libpcre3-dev|2:8.39-9ubuntu0.1 -protobuf-compiler|3.0.0-9.1ubuntu1.1 -chrpath|0.16-2 diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_run/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_run/Dockerfile deleted file mode 100644 index 92ede8bd1..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_run/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -FROM {{language_deps}} - -COPY --from={{build_deps}} /usr /usr -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{build_deps}} /lib /lib -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{build_deps}} /bin /bin -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{build_deps}} /opt /opt -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{build_deps}} /etc /etc -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{build_deps}} /env /env -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -RUN ldconfig - -RUN mkdir /exaudfclient /exaudf -COPY exaudfclient/base /exaudfclient/base - -WORKDIR /exaudfclient/base -RUN ["/bin/bash", "-c", "source /env && bash build.sh --config no-tty --config optimize --config python --config fast-binary-py3"] -RUN cp -r -L bazel-bin/* /exaudf - -RUN ./test_udfclient.sh /exaudf/exaudfclient_py3 - -WORKDIR /exaudf - -RUN rm -r /exaudfclient - -COPY --from={{build_deps}} /build_info /build_info -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -RUN mkdir /conf /buckets diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_steps.py b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_steps.py deleted file mode 100644 index 191755abe..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/build_steps.py +++ /dev/null @@ -1,147 +0,0 @@ -from typing import Dict - -from exasol_script_languages_container_tool.lib.tasks.build.docker_flavor_image_task import DockerFlavorAnalyzeImageTask - - -class AnalyzeUDFClientDeps(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "udfclient_deps" - - def get_additional_build_directories_mapping(self) -> Dict[str, str]: - return {"01_nodoc": "ext/01_nodoc", "scripts": "ext/scripts"} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeLanguageDeps(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "language_deps" - - def get_additional_build_directories_mapping(self) -> Dict[str, str]: - return {"scripts": "ext/scripts"} - - def requires_tasks(self): - return {"udfclient_deps": AnalyzeUDFClientDeps} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeBuildDeps(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "build_deps" - - def get_additional_build_directories_mapping(self) -> Dict[str, str]: - return {"01_nodoc": "ext/01_nodoc", "scripts": "ext/scripts"} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeBuildRun(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "build_run" - - def requires_tasks(self): - return {"build_deps": AnalyzeBuildDeps, - "language_deps": AnalyzeLanguageDeps} - - def get_additional_build_directories_mapping(self) -> Dict[str, str]: - return {"exaudfclient/base": "exaudfclient/base"} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeBaseTestDeps(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "base_test_deps" - - def requires_tasks(self): - return {"build_deps": AnalyzeBuildDeps} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeBaseTestBuildRun(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "base_test_build_run" - - def requires_tasks(self): - return {"base_test_deps": AnalyzeBaseTestDeps, - "language_deps": AnalyzeLanguageDeps} - - def get_additional_build_directories_mapping(self) -> Dict[str, str]: - return {"exaudfclient/base": "exaudfclient/base", "emulator": "emulator"} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeFlavorBaseDeps(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "flavor_base_deps" - - def requires_tasks(self): - return {"language_deps": AnalyzeLanguageDeps} - - def get_additional_build_directories_mapping(self): - return {"01_nodoc": "ext/01_nodoc", "scripts": "ext/scripts"} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeFlavorCustomization(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "flavor_customization" - - def requires_tasks(self): - return {"flavor_base_deps": AnalyzeFlavorBaseDeps} - - -class AnalyzeFlavorTestBuildRun(DockerFlavorAnalyzeImageTask): - - def get_build_step(self) -> str: - return "flavor_test_build_run" - - def requires_tasks(self): - return {"flavor_customization": AnalyzeFlavorCustomization, - "base_test_build_run": AnalyzeBaseTestBuildRun} - - def get_path_in_flavor(self): - return "flavor_base" - - -class AnalyzeRelease(DockerFlavorAnalyzeImageTask): - def get_build_step(self) -> str: - return "release" - - def requires_tasks(self): - return {"flavor_customization": AnalyzeFlavorCustomization, - "build_run": AnalyzeBuildRun, - "language_deps": AnalyzeLanguageDeps} - - def get_path_in_flavor(self): - return "flavor_base" - - -class SecurityScan(DockerFlavorAnalyzeImageTask): - def get_build_step(self) -> str: - return "security_scan" - - def requires_tasks(self): - return {"release": AnalyzeRelease} - - def get_path_in_flavor(self): - return "flavor_base" diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/Dockerfile deleted file mode 100644 index a66a1fcab..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM {{ language_deps }} - -RUN mkdir -p /build_info/packages -COPY flavor_base_deps/packages /build_info/packages/flavor_base_deps - -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/flavor_base_deps/apt_get_packages --with-versions - -RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flavor_base_deps/python3_pip_packages --python-binary python3 --with-versions diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages deleted file mode 100644 index 64c44f869..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages +++ /dev/null @@ -1,4 +0,0 @@ -unzip|6.0-25ubuntu1.2 -git|1:2.25.1-1ubuntu3.11 -libcurl4-openssl-dev|7.68.0-1ubuntu2.22 -build-essential|12.8ubuntu1.1 diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/Dockerfile deleted file mode 100644 index 53d7a801e..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{udfclient_deps}} - -RUN mkdir -p /build_info/packages/language_deps -COPY language_deps/packages/apt_get_packages /build_info/packages/language_deps - -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/language_deps/apt_get_packages --with-versions - -RUN /scripts/install_scripts/install_python3.8_pip.sh "pip == 21.3.1" - -COPY language_deps/packages/python3_pip_packages /build_info/packages/language_deps -RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/language_deps/python3_pip_packages --python-binary python3 --with-versions - -ENV PYTHON3_PREFIX /usr -ENV PYTHON3_VERSION python3.8 - diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages deleted file mode 100644 index 8ae9307ef..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/apt_get_packages +++ /dev/null @@ -1,5 +0,0 @@ -ca-certificates|20230311ubuntu0.20.04.1 -python3.8-dev|3.8.10-0ubuntu1~20.04.9 -python3-distutils|3.8.10-0ubuntu1~20.04 -curl|7.68.0-1ubuntu2.22 - diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/python3_pip_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/python3_pip_packages deleted file mode 100644 index 61d9c3ca1..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/python3_pip_packages +++ /dev/null @@ -1,3 +0,0 @@ -pandas|2.0.3 -numpy|1.24.3 -pyarrow|14.0.2 diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/release/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/release/Dockerfile deleted file mode 100644 index 920e5f5ad..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/release/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -FROM ubuntu:20.04 -RUN mkdir /conf /buckets - -COPY --from={{language_deps}} /usr /usr -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /lib /lib -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /bin /bin -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /opt /opt -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /etc /etc -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /build_info /build_info -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /var /var -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{language_deps}} /scripts /scripts -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -COPY --from={{flavor_customization}} /usr /usr -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /lib /lib -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /bin /bin -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /opt /opt -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /etc /etc -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /build_info /build_info -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /var /var -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -RUN ldconfig - -COPY --from={{build_run}} /exaudf /exaudf -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{build_run}} /build_info /build_info -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -RUN mkdir -p /build_info/actual_installed_packages/release && \ - /scripts/list_installed_scripts/list_installed_apt.sh > /build_info/actual_installed_packages/release/apt_get_packages && \ - /scripts/list_installed_scripts/list_installed_pip.sh python3.8 > /build_info/actual_installed_packages/release/python3_pip_packages diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/.trivyignore b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/.trivyignore deleted file mode 100644 index 5dc6d735f..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/.trivyignore +++ /dev/null @@ -1,37 +0,0 @@ -#the following CVE's affect kernel, no issue for container -CVE-2022-0847 -CVE-2022-0001 -CVE-2022-0002 -CVE-2022-1015 -CVE-2022-23960 -CVE-2022-25636 -CVE-2022-1116 -CVE-2022-29581 -CVE-2022-21499 -CVE-2022-43945 -CVE-2023-3090 -CVE-2023-3389 -CVE-2023-3390 -CVE-2023-3611 -CVE-2023-3776 -CVE-2023-3609 -CVE-2023-4622 -CVE-2023-4623 -CVE-2023-4921 -CVE-2023-4244 -CVE-2024-1086 -CVE-2024-26597 -CVE-2024-26583 -CVE-2024-26828 -CVE-2024-26865 -CVE-2024-26585 -# CVE-2023-20569 does not have a fix and is a problem of host system (amd cpus) -CVE-2023-20569 -#CVE-2022-23648 is a bug in containerd, not issue for containers -CVE-2022-23648 -#issue in cgroups, but no threat for ScriptLanguageContainer -CVE-2022-0492 -# CVE-2022-27191 is an issue in Go. Which will be installed only together with Trivy. -CVE-2022-27191 -# CVE-2022-23960 affects only ARM architectures -CVE-2022-23960 diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/Dockerfile deleted file mode 100644 index f60410048..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM ubuntu:20.04 -ENV DEBIAN_FRONTEND=noninteractive - -ENV ARCHIVE_UBUNTU_PREFIX="" -RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1$ARCHIVE_UBUNTU_PREFIX\2/" /etc/apt/sources.list - -COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc -COPY scripts /scripts - -RUN mkdir -p /build_info/packages -COPY udfclient_deps/packages /build_info/packages/udfclient_deps -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/udfclient_deps/apt_get_packages --with-versions - -RUN addgroup --gid 1000 exasolution -RUN adduser --disabled-login --uid 1000 --gid 1000 exasolution --gecos "First Last,RoomNumber,WorkPhone,HomePhone" -RUN addgroup --gid 500 exausers -RUN adduser --disabled-login --uid 500 --gid 500 exadefusr --gecos "First Last,RoomNumber,WorkPhone,HomePhone" - -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - -ENV PROTOBUF_LIBRARY_PREFIX=/usr/lib/ -ENV PROTOBUF_INCLUDE_PREFIX=/usr/include/ -ENV ZMQ_LIBRARY_PREFIX=/usr/lib -ENV ZMQ_INCLUDE_PREFIX=/usr/include diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages deleted file mode 100644 index f99b05423..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/udfclient_deps/packages/apt_get_packages +++ /dev/null @@ -1,6 +0,0 @@ -coreutils|8.30-3ubuntu2 -locales|2.31-0ubuntu9.15 -libnss-db|2.2.3pre1-6build6 -libzmq3-dev|4.3.2-2ubuntu1 -libprotobuf-dev|3.6.1.3-2ubuntu5.2 -libssl-dev|1.1.1f-1ubuntu2.22 diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/Dockerfile b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/Dockerfile deleted file mode 100644 index e83813dbe..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################################ -############################################################################################ -# This Dockerfile allows you to extend this flavor by installing packages or adding files. -# IF you didn't change the lines below, you can add packages and their version to the -# files in ./packages and they get automatically installed. -############################################################################################ -############################################################################################ - -####################################################################### -####################################################################### -# Do not change the following lines unless you know what you are doing -####################################################################### -####################################################################### - -FROM {{flavor_base_deps}} - -RUN mkdir -p /build_info/packages/flavor_customization - -COPY flavor_customization/packages/apt_get_packages /build_info/packages/flavor_customization -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/flavor_customization/apt_get_packages --with-versions - -COPY flavor_customization/packages/python3_pip_packages /build_info/packages/flavor_customization -RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flavor_customization/python3_pip_packages --python-binary python3 --with-versions --allow-no-version - - -########################################################################## -########################################################################## -# Below this text you can add any Dockerfile commands except of FROM. -# However only commands which change the filesystem will be -# reflected to the final script-language container. -# We recommend to use only RUN, COPY and ADD. For example, WORKDIR, USER -# and ENV will be not carried over into the final container. For more -# information about Dockerfile commands, please check the reference -# https://docs.docker.com/engine/reference/builder/#dockerfile-reference -########################################################################## -########################################################################## - - -########### -########### -# Examples: -########### -########### - -################################################# -# Execute a command during the build of the image -################################################# - -# With RUN you can excute any command you usally would run in a bash shell. -# It usually is a good idea to cleanup downloaded files or packages -# caches in the same in the same RUN statement to keep the image size -# small. You can execute multiple shell commands in one RUN statement -# by combine them with -# - `&&` (only execute if the previous command was successfull), -# - `||` (only execute if the previous command was unsuccesfull) -# - `;` (execute regardless of the success of the previous command) -# To format multiple command per RUN statement you can add a line break with `\`. -# If you need to execute complex sequences of commands you should execute -# scripts which you can copy into the image. -# ------------------------------------------------------------------------------- - -# RUN git clone https://github.com/exasol/data-science-examples -# RUN curl -o data-science-examples.zip https://codeload.github.com/exasol/data-science-examples/zip/master && \ -# unzip data-science-examples.zip && \ -# rm data-science-examples.zip - -##################################### -# Copy a file from ./ into the image. -##################################### - -# In case of exaslct it is important to prefix source files or directories with `flavor_customization` -# if you want to copy files or directories located in the same directory as this Dockerfile -# ----------------------------------------------------------------------------------------------------- - -# COPY flavor_customization/packages/python3_pip_packages /build_info/packages/flavor_customization -# ADD flavor_customization/code.tar.gz /code - diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/packages/apt_get_packages b/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/packages/apt_get_packages deleted file mode 100644 index d78cd6de0..000000000 --- a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/packages/apt_get_packages +++ /dev/null @@ -1,9 +0,0 @@ -# This file specifies the package list which gets installed via apt. -# You must specify the the package and its version separated by a |. -# We recommend here the usage of package versions, to ensure that the container -# builds are reproducible. However, we allow also packages without version. -# As you can see, this file can contain comments which start with #. -# If a line starts with # the whole line is a comment, however you can -# also start a comment after the package definition. - -# p7zip-full|16.02+dfsg-6 # you can check which versions of a package are available with apt-cache policy diff --git a/flavors/template-Exasol-all-python-3.8-conda/FLAVOR_DESCRIPTION.md b/flavors/template-Exasol-all-python-3.10-conda/FLAVOR_DESCRIPTION.md similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/FLAVOR_DESCRIPTION.md rename to flavors/template-Exasol-all-python-3.10-conda/FLAVOR_DESCRIPTION.md diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_build_run/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_deps/Dockerfile similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/base_test_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_deps/packages/apt_get_packages new file mode 100644 index 000000000..8c79ecae1 --- /dev/null +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_deps/packages/apt_get_packages @@ -0,0 +1,6 @@ +gdb|12.1-0ubuntu1~22.04 +valgrind|1:3.18.1-1ubuntu2 +gdbserver|12.1-0ubuntu1~22.04 +binutils|2.38-4ubuntu2.6 +patchelf|0.14.3-1 +strace|5.16-0ubuntu3 \ No newline at end of file diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages similarity index 86% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages index 5e8acf9d8..741e947e9 100644 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_deps/packages/conda_packages @@ -1,4 +1,4 @@ -protobuf|4.25.1 +protobuf|4.25.3 pcre|8.45 chrpath|0.16 openjdk|11.0.15 diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_run/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_steps.py b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_steps.py similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/build_steps.py rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_steps.py diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/Dockerfile similarity index 98% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/Dockerfile index 399f1a7e5..93ffb34a9 100644 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive ENV ARCHIVE_UBUNTU_PREFIX="" diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/_activate_current_env.sh b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/_activate_current_env.sh similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/_activate_current_env.sh rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/_activate_current_env.sh diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages new file mode 100644 index 000000000..adfc72b32 --- /dev/null +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/conda_deps/packages/apt_get_packages @@ -0,0 +1,5 @@ +coreutils|8.32-4.1ubuntu1.2 +locales|2.35-0ubuntu3.7 +curl|7.81.0-1ubuntu1.16 +ca-certificates|20230311ubuntu0.22.04.1 +bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/derived_from b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/derived_from similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/derived_from rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/derived_from diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/packages/conda_packages similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/packages/conda_packages diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/python3_pip_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/python3_pip_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_test_build_run/Dockerfile similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_test_build_run/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/flavor_test_build_run/Dockerfile diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_definition b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_definition similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_definition rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_definition diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/Dockerfile similarity index 92% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/Dockerfile index fe9edae37..c913d8955 100644 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/Dockerfile @@ -6,5 +6,5 @@ COPY language_deps/packages/ /build_info/packages/language_deps RUN /scripts/install_scripts/install_via_conda.pl --file /build_info/packages/language_deps/conda_packages --channel-file /build_info/packages/language_deps/conda_channels --with-versions --conda-binary /bin/micromamba ENV PYTHON3_PREFIX="$MAMBA_ROOT_PREFIX" -ENV PYTHON3_VERSION=python3.8 +ENV PYTHON3_VERSION=python3.10 diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/packages/conda_packages similarity index 79% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/packages/conda_packages index 6e986cd10..d18b3a297 100644 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/language_deps/packages/conda_packages @@ -1,11 +1,11 @@ libxcrypt|4.4.36 # Needed for building the udfclient and because libcrypt got removed from conda sysroot, see https://github.com/conda-forge/linux-sysroot-feedstock/issues/52 -python|3.8.13 -numpy|1.24.3 -pandas|2.0.3 -pyarrow|14.0.2 +python|3.10.4 +numpy|1.26.2 +pandas|2.2.2 +pyarrow|16.0.0 libblas|3.9.0=15_linux64_mkl -mamba|1.3.1 +mamba|1.5.1 ld_impl_linux-64|2.36.1 -cryptography|42.0.4 +cryptography|42.0.7 libxml2|2.10.3=hca2bb57_4 # Pinned for OpenJDK in build_deps icu|70.1=h27087fc_0 # Pinned for OpenJDK in build_deps diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/release/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/release/Dockerfile similarity index 95% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/release/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/release/Dockerfile index 51567761f..fc9ae859a 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/release/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/release/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV ENV_NAME="base" ENV MAMBA_ROOT_PREFIX="/opt/conda" @@ -66,5 +66,5 @@ RUN true # workaround for https://github.com/moby/moby/issues/37965 RUN mkdir -p /build_info/actual_installed_packages/release && \ /scripts/list_installed_scripts/list_installed_apt.sh > /build_info/actual_installed_packages/release/apt_get_packages && \ - /scripts/list_installed_scripts/list_installed_pip.sh "$MAMBA_ROOT_PREFIX/bin/python3.8" > /build_info/actual_installed_packages/release/python3_pip_packages && \ + /scripts/list_installed_scripts/list_installed_pip.sh "$MAMBA_ROOT_PREFIX/bin/python3.10" > /build_info/actual_installed_packages/release/python3_pip_packages && \ /scripts/list_installed_scripts/list_installed_conda.sh > /build_info/actual_installed_packages/release/conda_packages diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/.trivyignore b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/.trivyignore similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/.trivyignore rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/.trivyignore diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/Dockerfile similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/Dockerfile diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/packages/apt_get_packages similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/packages/apt_get_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/packages/apt_get_packages diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/packages/apt_get_packages_trivy_deps b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/security_scan/packages/apt_get_packages_trivy_deps rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/testconfig b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/testconfig similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_base/testconfig rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/testconfig diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/packages/conda_packages similarity index 65% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/packages/conda_packages index 253c3131d..96e975da9 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/udfclient_deps/packages/conda_packages @@ -1,6 +1,6 @@ -libprotobuf|4.25.1 -zeromq|4.3.4 -openssl|3.2.1 -nss|3.77 -cppzmq|4.8.1 +libprotobuf|4.25.3 +zeromq|4.3.5 +openssl|3.3.0 +nss|3.100 +cppzmq|4.10.0 _openmp_mutex|4.5=2_kmp_llvm # We need this, such that we can later install libblas with mkl, which is for example needed by pytorch diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_customization/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_customization/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_customization/Dockerfile rename to flavors/template-Exasol-all-python-3.10-conda/flavor_customization/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_customization/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-conda/flavor_customization/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_customization/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-conda/flavor_customization/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_customization/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_customization/packages/conda_packages similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_customization/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_customization/packages/conda_packages diff --git a/flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/packages/python3_pip_packages b/flavors/template-Exasol-all-python-3.10-conda/flavor_customization/packages/python3_pip_packages similarity index 100% rename from flavors/python-3.8-minimal-EXASOL-6.2.0/flavor_customization/packages/python3_pip_packages rename to flavors/template-Exasol-all-python-3.10-conda/flavor_customization/packages/python3_pip_packages diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/FLAVOR_DESCRIPTION.md b/flavors/template-Exasol-all-python-3.10-cuda-conda/FLAVOR_DESCRIPTION.md similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/FLAVOR_DESCRIPTION.md rename to flavors/template-Exasol-all-python-3.10-cuda-conda/FLAVOR_DESCRIPTION.md diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_build_run/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages new file mode 100644 index 000000000..8c79ecae1 --- /dev/null +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages @@ -0,0 +1,6 @@ +gdb|12.1-0ubuntu1~22.04 +valgrind|1:3.18.1-1ubuntu2 +gdbserver|12.1-0ubuntu1~22.04 +binutils|2.38-4ubuntu2.6 +patchelf|0.14.3-1 +strace|5.16-0ubuntu3 \ No newline at end of file diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages similarity index 51% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages index 5e8acf9d8..336600f96 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages @@ -1,8 +1,8 @@ -protobuf|4.25.1 +protobuf|4.25.3 pcre|8.45 chrpath|0.16 openjdk|11.0.15 bazel|5.2.0 -gxx_linux-64|11.2.0 -gcc_linux-64|11.2.0 +gxx_linux-64|12.1.0 +gcc_linux-64|12.1.0 make|4.3 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_run/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_steps.py b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_steps.py similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_steps.py rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_steps.py diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/conda_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/conda_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/conda_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/conda_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/conda_deps/_activate_current_env.sh b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/conda_deps/_activate_current_env.sh similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/conda_deps/_activate_current_env.sh rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/conda_deps/_activate_current_env.sh diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/derived_from b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/derived_from similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/derived_from rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/derived_from diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/Dockerfile similarity index 95% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/Dockerfile index 7c2849ea3..2303d6c3c 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/Dockerfile @@ -3,8 +3,6 @@ FROM {{ language_deps }} RUN mkdir -p /build_info/packages COPY flavor_base_deps/packages /build_info/packages/flavor_base_deps -ENV CONDA_OVERRIDE_CUDA=11.3 - RUN /scripts/install_scripts/install_via_conda.pl --file /build_info/packages/flavor_base_deps/conda_packages --channel-file /build_info/packages/flavor_base_deps/conda_channels --with-versions --conda-binary "$MAMBA_ROOT_PREFIX/bin/mamba" RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flavor_base_deps/python3_pip_packages --python-binary "$MAMBA_ROOT_PREFIX/bin/python3.8" --with-versions --allow-no-version diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages new file mode 100644 index 000000000..1ddf2e56e --- /dev/null +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages @@ -0,0 +1 @@ +cudnn|8.1.0.77 diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_test_build_run/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/flavor_test_build_run/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/flavor_test_build_run/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_definition b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_definition similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/language_definition rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_definition diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/Dockerfile similarity index 86% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/Dockerfile index 68b849612..5327dc082 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/Dockerfile @@ -3,8 +3,10 @@ FROM {{udfclient_deps}} RUN mkdir -p /build_info/packages/language_deps COPY language_deps/packages/ /build_info/packages/language_deps +ENV CONDA_OVERRIDE_CUDA=11.8 + RUN /scripts/install_scripts/install_via_conda.pl --file /build_info/packages/language_deps/conda_packages --channel-file /build_info/packages/language_deps/conda_channels --with-versions --conda-binary /bin/micromamba ENV PYTHON3_PREFIX=$MAMBA_ROOT_PREFIX -ENV PYTHON3_VERSION=python3.8 +ENV PYTHON3_VERSION=python3.10 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/packages/conda_channels similarity index 66% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/packages/conda_channels index bdff4d5cf..f0d7c46d7 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/conda_channels +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/packages/conda_channels @@ -1 +1,2 @@ conda-forge +nvidia \ No newline at end of file diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/packages/conda_packages similarity index 71% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/packages/conda_packages index bd7f1eb03..e12eec1a1 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/language_deps/packages/conda_packages @@ -1,11 +1,13 @@ libxcrypt|4.4.36 # Needed for building the udfclient and because libcrypt got removed from conda sysroot, see https://github.com/conda-forge/linux-sysroot-feedstock/issues/52 -python|3.8.13 -numpy|1.24.3 -pandas|2.0.3 -pyarrow|14.0.2=py38h296dbf9_9_cuda +python|3.10.4 +numpy|1.26.2 +pandas|2.2.2 +pyarrow|16.0.0 +libarrow|16.0.0=he216f8a_1_cuda libblas|3.9.0=15_linux64_mkl -mamba|1.3.1 +mamba|1.5.1 ld_impl_linux-64|2.36.1 -cryptography|42.0.4 +cryptography|42.0.7 libxml2|2.10.3=hca2bb57_4 # Pinned for OpenJDK in build_deps icu|70.1=h27087fc_0 # Pinned for OpenJDK in build_deps +cuda-toolkit|11.8.0 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile similarity index 92% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile index f9d39fe63..8f1ebffaf 100644 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive ENV ARCHIVE_UBUNTU_PREFIX="" @@ -12,7 +12,7 @@ RUN mkdir -p /build_info/packages COPY nvidia_driver_deps/packages /build_info/packages/nvidia_driver_deps RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/nvidia_driver_deps/apt_get_packages --with-versions -ENV NVIDIA_DRIVER_VERSION=510.47.03 +ENV NVIDIA_DRIVER_VERSION=550.54.15 RUN /scripts/install_scripts/install_nvidia_driver_libs.sh "$NVIDIA_DRIVER_VERSION" ENV LANG en_US.UTF-8 diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages new file mode 100644 index 000000000..adfc72b32 --- /dev/null +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages @@ -0,0 +1,5 @@ +coreutils|8.32-4.1ubuntu1.2 +locales|2.35-0ubuntu3.7 +curl|7.81.0-1ubuntu1.16 +ca-certificates|20230311ubuntu0.22.04.1 +bzip2|1.0.8-5build1 diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/release/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/release/Dockerfile similarity index 95% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/release/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/release/Dockerfile index 51567761f..fc9ae859a 100644 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/release/Dockerfile +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/release/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV ENV_NAME="base" ENV MAMBA_ROOT_PREFIX="/opt/conda" @@ -66,5 +66,5 @@ RUN true # workaround for https://github.com/moby/moby/issues/37965 RUN mkdir -p /build_info/actual_installed_packages/release && \ /scripts/list_installed_scripts/list_installed_apt.sh > /build_info/actual_installed_packages/release/apt_get_packages && \ - /scripts/list_installed_scripts/list_installed_pip.sh "$MAMBA_ROOT_PREFIX/bin/python3.8" > /build_info/actual_installed_packages/release/python3_pip_packages && \ + /scripts/list_installed_scripts/list_installed_pip.sh "$MAMBA_ROOT_PREFIX/bin/python3.10" > /build_info/actual_installed_packages/release/python3_pip_packages && \ /scripts/list_installed_scripts/list_installed_conda.sh > /build_info/actual_installed_packages/release/conda_packages diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/.trivyignore b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/.trivyignore similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/.trivyignore rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/.trivyignore diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/packages/apt_get_packages similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/packages/apt_get_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/packages/apt_get_packages diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/testconfig b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/testconfig similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/testconfig rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/testconfig diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages similarity index 65% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages index 253c3131d..96e975da9 100644 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_packages +++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages @@ -1,6 +1,6 @@ -libprotobuf|4.25.1 -zeromq|4.3.4 -openssl|3.2.1 -nss|3.77 -cppzmq|4.8.1 +libprotobuf|4.25.3 +zeromq|4.3.5 +openssl|3.3.0 +nss|3.100 +cppzmq|4.10.0 _openmp_mutex|4.5=2_kmp_llvm # We need this, such that we can later install libblas with mkl, which is for example needed by pytorch diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/Dockerfile similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/Dockerfile rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/Dockerfile diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_channels b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/packages/conda_channels similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_channels rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/packages/conda_channels diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/packages/conda_packages similarity index 100% rename from flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/conda_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/packages/conda_packages diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_customization/packages/python3_pip_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/packages/python3_pip_packages similarity index 100% rename from flavors/template-Exasol-all-python-3.8-conda/flavor_customization/packages/python3_pip_packages rename to flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_customization/packages/python3_pip_packages diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_deps/packages/apt_get_packages deleted file mode 100644 index 5b9fe3f8d..000000000 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/base_test_deps/packages/apt_get_packages +++ /dev/null @@ -1,4 +0,0 @@ -gdb|9.2-0ubuntu1~20.04.1 -valgrind|1:3.15.0-1ubuntu9.1 -gdbserver|9.2-0ubuntu1~20.04.1 -strace|5.5-3ubuntu1 diff --git a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages deleted file mode 100644 index 49a20a37c..000000000 --- a/flavors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages +++ /dev/null @@ -1,4 +0,0 @@ -coreutils|8.30-3ubuntu2 -locales|2.31-0ubuntu9.15 -curl|7.68.0-1ubuntu2.22 -ca-certificates|20230311ubuntu0.20.04.1 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/Dockerfile b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/Dockerfile deleted file mode 100644 index 3a8ca3f61..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM {{build_deps}} - -RUN mkdir -p /build_info/packages -COPY base_test_deps/packages /build_info/packages/base_test_deps - -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/base_test_deps/apt_get_packages --with-versions diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages deleted file mode 100644 index 5b9fe3f8d..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/base_test_deps/packages/apt_get_packages +++ /dev/null @@ -1,4 +0,0 @@ -gdb|9.2-0ubuntu1~20.04.1 -valgrind|1:3.15.0-1ubuntu9.1 -gdbserver|9.2-0ubuntu1~20.04.1 -strace|5.5-3ubuntu1 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages deleted file mode 100644 index 7f289e5a2..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/conda_packages +++ /dev/null @@ -1,2 +0,0 @@ -cudatoolkit|11.3.1 -cudnn|8.1.0.77 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_base_deps/packages/python3_pip_packages deleted file mode 100644 index e69de29bb..000000000 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_test_build_run/Dockerfile deleted file mode 100644 index 32230a4d9..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/flavor_test_build_run/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM {{base_test_build_run}} - -RUN mkdir -p /conf /buckets - -COPY --from={{flavor_customization}} /usr /usr -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /opt /opt -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /lib /lib -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /bin /bin -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /etc /etc -RUN true # workaround for https://github.com/moby/moby/issues/37965 - -COPY --from={{flavor_customization}} /build_info /build_info -RUN true # workaround for https://github.com/moby/moby/issues/37965 - - -RUN ldconfig - diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_definition b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_definition deleted file mode 100644 index 82e76acf3..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/language_definition +++ /dev/null @@ -1 +0,0 @@ -PYTHON3=localzmq+protobuf:///{{ bucketfs_name }}/{{ bucket_name }}/{{ path_in_bucket }}{{ release_name }}?lang=python#buckets/{{ bucketfs_name }}/{{ bucket_name }}/{{ path_in_bucket }}{{ release_name }}/exaudf/exaudfclient_py3 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages deleted file mode 100644 index 49a20a37c..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages +++ /dev/null @@ -1,4 +0,0 @@ -coreutils|8.30-3ubuntu2 -locales|2.31-0ubuntu9.15 -curl|7.68.0-1ubuntu2.22 -ca-certificates|20230311ubuntu0.20.04.1 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/Dockerfile b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/Dockerfile deleted file mode 100644 index 15291fc84..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM {{release}} -ENV DEBIAN_FRONTEND=noninteractive - -RUN mkdir -p /build_info/packages -COPY security_scan/packages /build_info/packages/security_scan -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/security_scan/apt_get_packages_trivy_deps -RUN curl -s https://aquasecurity.github.io/trivy-repo/deb/public.key | apt-key add - && \ - /scripts/install_scripts/install_ppa.pl --ppa 'deb https://aquasecurity.github.io/trivy-repo/deb bionic main' --out-file trivy.list -RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/security_scan/apt_get_packages - -ENV SECURITY_SCANNERS="trivy" -COPY /security_scan/.trivyignore /.trivyignore - -ENTRYPOINT ["/scripts/security_scan/run.sh"] \ No newline at end of file diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages deleted file mode 100644 index 6bd628d4c..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages +++ /dev/null @@ -1 +0,0 @@ -trivy diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps deleted file mode 100644 index 8920661bf..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/security_scan/packages/apt_get_packages_trivy_deps +++ /dev/null @@ -1,2 +0,0 @@ -apt-transport-https -gnupg \ No newline at end of file diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/testconfig b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/testconfig deleted file mode 100644 index d1bdb8113..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_base/testconfig +++ /dev/null @@ -1,2 +0,0 @@ -generic_language_tests=python3 -test_folders=python3/all pandas/all pandas/pandas2 diff --git a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/python3_pip_packages b/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/python3_pip_packages deleted file mode 100644 index a9f22f993..000000000 --- a/flavors/template-Exasol-all-python-3.8-cuda-conda/flavor_customization/packages/python3_pip_packages +++ /dev/null @@ -1,9 +0,0 @@ -# This file specifies the package list which gets installed via pip for python3. -# You must specify the the package and its version separated by a |. -# We recommend here the usage of package versions, to ensure that the container -# builds are reproducible. However, we allow also packages without version. -# As you can see, this file can contain comments which start with #. -# If a line starts with # the whole line is a comment, however you can -# also start a comment after the package definition. - -#tensorflow-probability|0.9.0