From f240ff5c99fffca5e28817a0810c4e463f27090e Mon Sep 17 00:00:00 2001 From: Jure Bajic Date: Thu, 5 Dec 2024 16:27:26 +0100 Subject: [PATCH 1/2] Add better blas library --- containers/buildUbuntuDevel.docker/Dockerfile.arm64 | 2 +- containers/buildUbuntuDevel.docker/Dockerfile.x86-64 | 2 +- helper.linux.fish | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/buildUbuntuDevel.docker/Dockerfile.arm64 b/containers/buildUbuntuDevel.docker/Dockerfile.arm64 index 35f61ac9..5dac4188 100644 --- a/containers/buildUbuntuDevel.docker/Dockerfile.arm64 +++ b/containers/buildUbuntuDevel.docker/Dockerfile.arm64 @@ -102,7 +102,7 @@ RUN apt-get update --fix-missing && \ psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus bc tcpdump \ liburing-dev cppcheck clang-${CLANG_VERSION} lldb-${CLANG_VERSION} lld-${CLANG_VERSION} \ libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev \ - libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-16-dev liblapack-dev gfortran \ + libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-16-dev libopenblas-dev liblapack-dev gfortran \ && apt-get clean # yarn for UI build: diff --git a/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 b/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 index e8c7933e..f5e2c08e 100644 --- a/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 +++ b/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 @@ -103,7 +103,7 @@ RUN apt-get update --fix-missing && \ psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus bc tcpdump \ liburing-dev cppcheck clang-${CLANG_VERSION} lldb-${CLANG_VERSION} lld-${CLANG_VERSION} \ libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev \ - libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-16-dev liblapack-dev gfortran \ + libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-16-dev liblapack-dev libopenblas-dev gfortran \ && apt-get clean # yarn for UI build: diff --git a/helper.linux.fish b/helper.linux.fish index 439b62a2..04764565 100755 --- a/helper.linux.fish +++ b/helper.linux.fish @@ -22,7 +22,7 @@ else end set -gx UBUNTUBUILDIMAGE_312_NAME arangodb/ubuntubuildarangodb-devel -set -gx UBUNTUBUILDIMAGE_312_TAG 9 +set -gx UBUNTUBUILDIMAGE_312_TAG 10 set -gx UBUNTUBUILDIMAGE_312 $UBUNTUBUILDIMAGE_312_NAME:$UBUNTUBUILDIMAGE_312_TAG-$UBUNTUBUILDIMAGE_TAG_ARCH set -gx UBUNTUBUILDIMAGE_311_NAME $UBUNTUBUILDIMAGE_312_NAME From e470b4aa246d3b3114cc665a90eb78fa7a07bb3a Mon Sep 17 00:00:00 2001 From: Jure Bajic Date: Tue, 10 Dec 2024 09:26:11 +0100 Subject: [PATCH 2/2] Have consistent order of packages --- containers/buildUbuntuDevel.docker/Dockerfile.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/buildUbuntuDevel.docker/Dockerfile.arm64 b/containers/buildUbuntuDevel.docker/Dockerfile.arm64 index 5dac4188..84783cd4 100644 --- a/containers/buildUbuntuDevel.docker/Dockerfile.arm64 +++ b/containers/buildUbuntuDevel.docker/Dockerfile.arm64 @@ -102,7 +102,7 @@ RUN apt-get update --fix-missing && \ psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus bc tcpdump \ liburing-dev cppcheck clang-${CLANG_VERSION} lldb-${CLANG_VERSION} lld-${CLANG_VERSION} \ libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev \ - libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-16-dev libopenblas-dev liblapack-dev gfortran \ + libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-16-dev liblapack-dev libopenblas-dev gfortran \ && apt-get clean # yarn for UI build: