diff --git a/src/cpp/.devcontainer/base-scripts/install-vcpkg.sh b/src/cpp/.devcontainer/base-scripts/install-vcpkg.sh index 2535d6598..06467af96 100644 --- a/src/cpp/.devcontainer/base-scripts/install-vcpkg.sh +++ b/src/cpp/.devcontainer/base-scripts/install-vcpkg.sh @@ -10,17 +10,6 @@ USERNAME=${1:-"vscode"} . /etc/os-release -# The buster pkg repo install cmake version < 3.15 which is required to run bootstrap-vcpkg.sh on ARM64 -VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES="buster" - -if [ "$(dpkg --print-architecture)" = "arm64" ]; then - # Exit early if ARM64 OS does not have cmake version required to build Vcpkg - if [[ "${VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then - echo "OS ${VERSION_CODENAME} ARM64 pkg repo installs cmake version < 3.15, which is required to build Vcpkg." - exit 0 - fi -fi - # Add to bashrc/zshrc files for all users. updaterc() { echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..." diff --git a/src/cpp/README.md b/src/cpp/README.md index cfec39b72..5fa9d2df2 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -9,7 +9,7 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/cpp | -| *Available image variants* | debian-12, debian-11, debian-10, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) | +| *Available image variants* | debian-12, debian-11, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) | | *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-12`, `debian-11`, `ubuntu-24.04` and `ubuntu-22.04` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian, Ubuntu | @@ -25,7 +25,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag - `mcr.microsoft.com/devcontainers/cpp:debian` (latest Debian GA) - `mcr.microsoft.com/devcontainers/cpp:debian-12` (or `bookworm`) - `mcr.microsoft.com/devcontainers/cpp:debian-11` (or `bullseye`) -- `mcr.microsoft.com/devcontainers/cpp:debian-10` (or `buster`) - `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS) - `mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04` (or `noble`) - `mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04` (or `jammy`) diff --git a/src/cpp/manifest.json b/src/cpp/manifest.json index cedbe6536..7b01ddb94 100644 --- a/src/cpp/manifest.json +++ b/src/cpp/manifest.json @@ -3,7 +3,6 @@ "variants": [ "bookworm", "bullseye", - "buster", "noble", "jammy", "focal" @@ -13,7 +12,6 @@ "parent": { "bookworm": "base-debian", "bullseye": "base-debian", - "buster": "base-debian", "noble": "base-ubuntu", "jammy": "base-ubuntu", "focal": "base-ubuntu" @@ -28,9 +26,6 @@ "linux/amd64", "linux/arm64" ], - "buster": [ - "linux/amd64" - ], "noble": [ "linux/amd64", "linux/arm64" @@ -58,10 +53,6 @@ "cpp:${VERSION}-debian11", "cpp:${VERSION}" ], - "buster": [ - "cpp:${VERSION}-debian-10", - "cpp:${VERSION}-debian10" - ], "noble": [ "cpp:${VERSION}-ubuntu-24.04", "cpp:${VERSION}-ubuntu24.04"