Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion containers/buildUbuntu311.docker/Dockerfile.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion containers/buildUbuntu311.docker/Dockerfile.x86-64
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion containers/buildUbuntuDevel.docker/Dockerfile.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion containers/buildUbuntuDevel.docker/Dockerfile.x86-64
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions helper.linux.fish
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/buildArangoDB311.fish
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion scripts/buildArangoDBDevel.fish
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down