Skip to content

Commit 1b381e4

Browse files
feat(cpp): update Ubuntu images to v24.04
1 parent 085ffe5 commit 1b381e4

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/publish-cpp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ jobs:
4141
images: ${{ env.REGISTRY }}/deeplex/devcontainer-cpp
4242
flavor: |
4343
latest=false
44-
prefix=ubuntu-22.04-,onlatest=true
44+
prefix=ubuntu-24.04-,onlatest=true
4545
tags: |
46-
type=raw,value=ubuntu-22.04,prefix=
46+
type=raw,value=ubuntu-24.04,prefix=
4747
4848
- name: Build and push Docker image
4949
uses: docker/build-push-action@v6

src/cpp/Dockerfile

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
1+
FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
22

33
USER root
44
SHELL [ "/bin/bash", "-c" ]
@@ -9,29 +9,30 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
99
apt-get -qq update && apt-get -qq install --no-install-recommends \
1010
bash-completion \
1111
build-essential \
12-
clang-16 \
13-
clang-format-16 \
14-
clang-tidy-16 \
12+
clang-19 \
13+
clang-format-19 \
14+
clang-tidy-19 \
1515
curl \
16-
g++-12 \
17-
gcc-12 \
16+
g++-14 \
17+
gcc-14 \
1818
gdb \
1919
git \
20-
lldb-16 \
21-
llvm-16 \
20+
lldb-19 \
21+
llvm-19 \
2222
ninja-build \
2323
pkg-config \
2424
python3 \
2525
python3-pip \
26+
python3-venv \
2627
tar \
2728
unzip \
2829
zip \
2930
zsh \
3031
&& apt-get -qq autoremove \
3132
&& apt-get -qq clean \
3233
&& rm -rf /var/lib/apt/lists/* \
33-
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 120 --slave /usr/bin/g++ g++ /usr/bin/g++-12 \
34-
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 160 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-16
34+
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 140 --slave /usr/bin/g++ g++ /usr/bin/g++-14 \
35+
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 190 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-19
3536

3637
ARG CMAKE_VERSION="3.22.6"
3738
RUN declare -A archs=( ["amd64"]="x86_64" ["arm64"]="aarch64" ); \
@@ -62,5 +63,3 @@ RUN mkdir -p "$VCPKG_ROOT" \
6263
&& echo 'export VCPKG_DOWNLOADS="$HOME/.cache/vcpkg/downloads"' >> ~vscode/.bash_profile
6364

6465
USER vscode
65-
66-
RUN python3 -m pip install --user pipenv

0 commit comments

Comments
 (0)