diff --git a/containers/buildUbuntu311.docker/Dockerfile.arm64 b/containers/buildUbuntu311.docker/Dockerfile.arm64 index 94d95a6b..77ccfb42 100644 --- a/containers/buildUbuntu311.docker/Dockerfile.arm64 +++ b/containers/buildUbuntu311.docker/Dockerfile.arm64 @@ -68,7 +68,7 @@ RUN curl -L https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERS COPY ./tools/* /tools/ -RUN [ "/tools/install.sh", "3.4", "1" ] +RUN [ "/tools/install.sh", "3.5", "0" ] COPY ./scripts /scripts diff --git a/containers/buildUbuntu311.docker/Dockerfile.x86-64 b/containers/buildUbuntu311.docker/Dockerfile.x86-64 index be4fcc89..3df60af2 100644 --- a/containers/buildUbuntu311.docker/Dockerfile.x86-64 +++ b/containers/buildUbuntu311.docker/Dockerfile.x86-64 @@ -68,7 +68,7 @@ RUN curl -L https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERS COPY ./tools/* /tools/ -RUN [ "/tools/install.sh", "3.4", "1" ] +RUN [ "/tools/install.sh", "3.5", "0" ] COPY ./scripts /scripts diff --git a/containers/buildUbuntuDevel.docker/Dockerfile.arm64 b/containers/buildUbuntuDevel.docker/Dockerfile.arm64 index 896eb753..37d269de 100644 --- a/containers/buildUbuntuDevel.docker/Dockerfile.arm64 +++ b/containers/buildUbuntuDevel.docker/Dockerfile.arm64 @@ -148,7 +148,7 @@ COPY --from=openmp /opt/omp /opt/omp COPY ./tools/* /tools/ -RUN [ "/tools/install.sh", "3.4", "1" ] +RUN [ "/tools/install.sh", "3.5", "0" ] COPY ./scripts /scripts diff --git a/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 b/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 index fac65196..0cf5cb5d 100644 --- a/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 +++ b/containers/buildUbuntuDevel.docker/Dockerfile.x86-64 @@ -147,7 +147,7 @@ COPY --from=openmp /opt/omp /opt/omp COPY ./tools/* /tools/ -RUN [ "/tools/install.sh", "3.4", "1" ] +RUN [ "/tools/install.sh", "3.5", "0" ] COPY ./scripts /scripts diff --git a/helper.linux.fish b/helper.linux.fish index 5a1a45e4..52d55081 100755 --- a/helper.linux.fish +++ b/helper.linux.fish @@ -22,11 +22,11 @@ else end set -gx UBUNTUBUILDIMAGE_312_NAME arangodb/ubuntubuildarangodb-devel -set -gx UBUNTUBUILDIMAGE_312_TAG 13 +set -gx UBUNTUBUILDIMAGE_312_TAG 14 set -gx UBUNTUBUILDIMAGE_312 $UBUNTUBUILDIMAGE_312_NAME:$UBUNTUBUILDIMAGE_312_TAG-$UBUNTUBUILDIMAGE_TAG_ARCH set -gx UBUNTUBUILDIMAGE_311_NAME arangodb/ubuntubuildarangodb-311 -set -gx UBUNTUBUILDIMAGE_311_TAG 2 +set -gx UBUNTUBUILDIMAGE_311_TAG 3 set -gx UBUNTUBUILDIMAGE_311 $UBUNTUBUILDIMAGE_311_NAME:$UBUNTUBUILDIMAGE_311_TAG-$UBUNTUBUILDIMAGE_TAG_ARCH set -gx UBUNTUPACKAGINGIMAGE arangodb/ubuntupackagearangodb-$ARCH:1 diff --git a/scripts/buildArangoDB311.fish b/scripts/buildArangoDB311.fish index 16d535b6..68c817fe 100755 --- a/scripts/buildArangoDB311.fish +++ b/scripts/buildArangoDB311.fish @@ -29,7 +29,7 @@ else end if test "$OPENSSL_VERSION" = "" - set -xg OPENSSL_VERSION 3.4 + set -xg OPENSSL_VERSION 3.5 end echo "Using openssl version $OPENSSL_VERSION" diff --git a/scripts/buildArangoDBDevel.fish b/scripts/buildArangoDBDevel.fish index a5fe96e8..c625df7b 100755 --- a/scripts/buildArangoDBDevel.fish +++ b/scripts/buildArangoDBDevel.fish @@ -29,7 +29,7 @@ else end if test "$OPENSSL_VERSION" = "" - set -xg OPENSSL_VERSION 3.4 + set -xg OPENSSL_VERSION 3.5 end echo "Using openssl version $OPENSSL_VERSION"