Merge branch 'master' into feature/864_add_python_310_template_flavor

exasol · Dec 13, 2023 · 761f724 · 761f724
2 parents 4c4eb49 + aa5e006
commit 761f724
Show file tree

Hide file tree

Showing 29 changed files with 1,309 additions and 874 deletions.
diff --git a/exaslct_scripts/exaslct.sh b/exaslct_scripts/exaslct.sh
diff --git a/exaudfclient/base/.bazelrc b/exaudfclient/base/.bazelrc
@@ -1,4 +1,4 @@
-build --copt='-std=c++14' --force_pic --action_env=PROTOBUF_BIN --action_env=PROTOBUF_LIBRARY_PREFIX --action_env=PROTOBUF_INCLUDE_PREFIX 
+build --copt='-std=c++17' --force_pic --action_env=PROTOBUF_BIN --action_env=PROTOBUF_LIBRARY_PREFIX --action_env=PROTOBUF_INCLUDE_PREFIX 
 # TODO add environment variables for R libraries
 build:benchmark --define benchmark=true
 build:java  --define java=true --action_env=JAVA_PREFIX

diff --git a/ext/scripts/install_scripts/install_python2.7_pip.sh b/ext/scripts/install_scripts/install_python2.7_pip.sh
diff --git a/ext/scripts/install_scripts/install_python3.6_pip.sh b/ext/scripts/install_scripts/install_python3.6_pip.sh
diff --git a/ext/scripts/install_scripts/install_python3.7_pip.sh b/ext/scripts/install_scripts/install_python3.7_pip.sh
diff --git a/ext/scripts/tests/Dockerfile b/ext/scripts/tests/Dockerfile
@@ -1,8 +1,7 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update && apt-get install --no-install-recommends -y python3-distutils python-distutils-extra r-base perl-base perl-doc locales curl git build-essential
 COPY install_scripts/install_python*_pip.sh / 
-RUN /install_python3.6_pip.sh
-RUN /install_python2.7_pip.sh
+RUN /install_python3.8_pip.sh "pip>20"
 COPY . /scripts
diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/all_versions_specified
@@ -1,2 +1,2 @@
-curl|7.58.0-2ubuntu3.24 # t1
-wget|1.19.4-1ubuntu2.2 # t2
+curl|7.68.0-1ubuntu2.21 # t1
+wget|1.20.3-1ubuntu2 # t2
diff --git a/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions b/ext/scripts/tests/install_scripts/test_files/apt/with_versions/some_missing_versions
@@ -1,3 +1,3 @@
-curl|7.58.0-2ubuntu3.24 # t1
+curl|7.68.0-1ubuntu2.21 # t1
 wget| # t2
 git|
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
@@ -1,6 +1,6 @@
 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.6
+binutils|2.34-6ubuntu1.7
 patchelf|0.10-2build1
 strace|5.5-3ubuntu1
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
@@ -1,7 +1,7 @@
 coreutils|8.28-1ubuntu1
-locales|2.27-3ubuntu1.6
+locales|2.31-0ubuntu9.14
 tar|1.29b-2ubuntu0.4
-curl|7.68.0-1ubuntu2.19
+curl|7.68.0-1ubuntu2.21
 openjdk-11-jdk|11.0.19+7~us1-0ubuntu1~20.04.1
 build-essential|12.4ubuntu1
 libpcre3-dev|2:8.39-9ubuntu0.1

diff --git a/...rs/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages b/...rs/python-3.8-minimal-EXASOL-6.2.0/flavor_base/flavor_base_deps/packages/apt_get_packages
@@ -1,4 +1,4 @@
 unzip|6.0-25ubuntu1.1
 git|1:2.25.1-1ubuntu3.11
-libcurl4-openssl-dev|7.68.0-1ubuntu2.19
+libcurl4-openssl-dev|7.68.0-1ubuntu2.21
 build-essential|12.8ubuntu1.1
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
@@ -1,5 +1,5 @@
 ca-certificates|20230311ubuntu0.20.04.1
-python3.8-dev|3.8.10-0ubuntu1~20.04.8
+python3.8-dev|3.8.10-0ubuntu1~20.04.9
 python3-distutils|3.8.10-0ubuntu1~20.04
-curl|7.68.0-1ubuntu2.19
+curl|7.68.0-1ubuntu2.21
 
diff --git a/...s/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/python3_pip_packages b/...s/python-3.8-minimal-EXASOL-6.2.0/flavor_base/language_deps/packages/python3_pip_packages
@@ -1,3 +1,3 @@
 pandas|2.0.2 
 numpy|1.24.3
-pyarrow|12.0.0
+pyarrow|14.0.1
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
@@ -18,6 +18,7 @@ CVE-2023-3609
 CVE-2023-4622
 CVE-2023-4623
 CVE-2023-4921
+CVE-2023-4244
 # 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

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
@@ -1,6 +1,6 @@
 coreutils|8.30-3ubuntu2
-locales|2.31-0ubuntu9.9
+locales|2.31-0ubuntu9.14
 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.19
+libssl-dev|1.1.1f-1ubuntu2.20
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.8-conda/flavor_base/build_deps/packages/conda_packages
@@ -1,4 +1,4 @@
-protobuf|4.21.12
+protobuf|4.24.4
 pcre|8.45
 chrpath|0.16
 openjdk|11.0.15

diff --git a/...ors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages b/...ors/template-Exasol-all-python-3.8-conda/flavor_base/conda_deps/packages/apt_get_packages
@@ -1,4 +1,4 @@
 coreutils|8.30-3ubuntu2
-locales|2.31-0ubuntu9.9
-curl|7.68.0-1ubuntu2.19
+locales|2.31-0ubuntu9.14
+curl|7.68.0-1ubuntu2.21
 ca-certificates|20230311ubuntu0.20.04.1
diff --git a/...rs/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_packages b/...rs/template-Exasol-all-python-3.8-conda/flavor_base/language_deps/packages/conda_packages
@@ -1,7 +1,7 @@
 python|3.8.13
 numpy|1.24.3
 pandas|2.0.2
-pyarrow|12.0.0
+pyarrow|14.0.1
 libblas|3.9.0=15_linux64_mkl
 mamba|1.3.1
 ld_impl_linux-64|2.36.1

diff --git a/...s/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_packages b/...s/template-Exasol-all-python-3.8-conda/flavor_base/udfclient_deps/packages/conda_packages
@@ -1,6 +1,6 @@
-libprotobuf|3.21.12
+libprotobuf|4.24.4
 zeromq|4.3.4
-openssl|3.1.2
+openssl|3.1.4
 nss|3.77
 cppzmq|4.8.1
 _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/.../template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_packages b/.../template-Exasol-all-python-3.8-cuda-conda/flavor_base/build_deps/packages/conda_packages
@@ -1,4 +1,4 @@
-protobuf|4.21.12
+protobuf|4.24.4
 pcre|8.45
 chrpath|0.16
 openjdk|11.0.15

diff --git a/...mplate-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_packages b/...mplate-Exasol-all-python-3.8-cuda-conda/flavor_base/language_deps/packages/conda_packages
@@ -1,7 +1,7 @@
 python|3.8.13
 numpy|1.24.3
 pandas|2.0.2
-pyarrow|12.0.0=py38h4559c88_4_cuda
+pyarrow|14.0.1=py38h296dbf9_0_cuda
 libblas|3.9.0=15_linux64_mkl
 mamba|1.3.1
 ld_impl_linux-64|2.36.1

diff --git a/...Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages b/...Exasol-all-python-3.8-cuda-conda/flavor_base/nvidia_driver_deps/packages/apt_get_packages
@@ -1,4 +1,4 @@
 coreutils|8.30-3ubuntu2
-locales|2.31-0ubuntu9.9
-curl|7.68.0-1ubuntu2.19
+locales|2.31-0ubuntu9.14
+curl|7.68.0-1ubuntu2.21
 ca-certificates|20230311ubuntu0.20.04.1
diff --git a/...plate-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages b/...plate-Exasol-all-python-3.8-cuda-conda/flavor_base/udfclient_deps/packages/conda_packages
@@ -1,6 +1,6 @@
-libprotobuf|3.21.12
+libprotobuf|4.24.4
 zeromq|4.3.4
-openssl|3.1.2
+openssl|3.1.4
 nss|3.77
 cppzmq|4.8.1
 _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