Skip to content

Commit 338a801

Browse files
committed
try to use 24.04
1 parent 3724570 commit 338a801

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
LABEL org.opencontainers.image.source https://github.com/su2code/Docker-Builds
44

@@ -26,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y \
2626
&& rm -rf /var/lib/apt/lists/* \
2727
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
2828
&& /usr/sbin/update-ccache-symlinks \
29-
&& echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
29+
&& echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
3030

3131
# Copies your code file from your action repository to the filesystem path `/` of the container
3232
COPY compileSU2.sh /compileSU2.sh

build/Dockerfile.tsan

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
LABEL org.opencontainers.image.source https://github.com/su2code/Docker-Builds
44

@@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt update && apt install -y \
3232
RUN cd / \
3333
&& git clone git://gcc.gnu.org/git/gcc.git gcc_sources \
3434
&& cd gcc_sources \
35-
&& git checkout releases/gcc-9.4.0 \
35+
&& git checkout releases/gcc-13.3.0 \
3636
&& ./contrib/download_prerequisites \
3737
&& cd / \
3838
&& mkdir gcc_objdir \
@@ -45,15 +45,15 @@ RUN cd / \
4545
&& rm -rf gcc_objdir \
4646
&& cd /gcc_install/bin \
4747
&& ln -s gcc cc
48-
48+
4949
# Ensure that ccache uses the built gcc
5050
RUN export PATH=/gcc_install/bin:$PATH \
5151
&& /usr/sbin/update-ccache-symlinks
5252

5353
# Configure environment for the built gcc, also enable thread sanitizer
5454
ENV LD_LIBRARY_PATH=/gcc_install/lib64:$LD_LIBRARY_PATH
55-
ENV CXXFLAGS="-I/gcc_install/include/c++/9.4.0 -I/gcc_install/include/c++/9.4.0/x86_64-pc-linux-gnu -fsanitize=thread"
56-
ENV CFLAGS="-I/gcc_install/include/c++/9.4.0 -I/gcc_install/include/c++/9.4.0/x86_64-pc-linux-gnu -fsanitize=thread"
55+
ENV CXXFLAGS="-I/gcc_install/include/c++/13.3.0 -I/gcc_install/include/c++/13.3.0/x86_64-pc-linux-gnu -fsanitize=thread"
56+
ENV CFLAGS="-I/gcc_install/include/c++/13.3.0 -I/gcc_install/include/c++/13.3.0/x86_64-pc-linux-gnu -fsanitize=thread"
5757
ENV LDFLAGS="-L/gcc_install/lib64 -fsanitize=thread"
5858
ENV PATH=/usr/lib/ccache:/gcc_install/bin:$PATH
5959
ENV TSAN_OPTIONS="history_size=7 halt_on_error=1"

0 commit comments

Comments
 (0)