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
Cpp: Ubuntu 18.04 (bionic) - End of Standard Support
  • Loading branch information
samruddhikhandale committed Jun 2, 2023
commit e0e81eb4322de0db25db4c362bbb406575e7d21c
4 changes: 2 additions & 2 deletions .github/workflows/push-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
if: "github.ref == 'refs/heads/main'"
strategy:
matrix:
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51]
page-total: [51]
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50]
page-total: [50]
fail-fast: false
runs-on: devcontainer-image-builder-ubuntu
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
if: ${{ github.event.base_ref == 'refs/heads/main' }}
strategy:
matrix:
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51]
page-total: [51]
page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50]
page-total: [50]
fail-fast: false
runs-on: devcontainer-image-builder-ubuntu
steps:
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-20.04
ARG VARIANT=debian-11
FROM mcr.microsoft.com/devcontainers/base:0-${VARIANT}
USER root
Expand Down
5 changes: 1 addition & 4 deletions src/cpp/.devcontainer/base-scripts/install-vcpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ set -e

USERNAME=${1:-"vscode"}

# bionic and stretch pkg repos install cmake version < 3.15 which is required to run bootstrap-vcpkg.sh on ARM64
VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES="stretch bionic"

. /etc/os-release

# Exit early if ARM64 OS does not have cmake version required to build Vcpkg
if [ "$(dpkg --print-architecture)" = "arm64" ] && [[ "${VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
if [ "$(dpkg --print-architecture)" = "arm64" ]; then
echo "OS ${VERSION_CODENAME} ARM64 pkg repo installs cmake version < 3.15, which is required to build Vcpkg."
exit 0
fi
Expand Down
5 changes: 2 additions & 3 deletions src/cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
| *Categories* | Core, Languages |
| *Image type* | Dockerfile |
| *Published images* | mcr.microsoft.com/devcontainers/cpp |
| *Available image variants* | debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-11`, `ubuntu-22.04`, and `ubuntu-18.04` variants |
| *Available image variants* | debian-11, debian-10, 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-11`,and `ubuntu-22.04` variants |
| *Container host OS support* | Linux, macOS, Windows |
| *Container OS* | Debian, Ubuntu |
| *Languages, platforms* | C++ |
Expand All @@ -28,7 +28,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
- `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04` (or `jammy`)
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04` (or `focal`)
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-18.04` (or `bionic`)

Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.

Expand Down
14 changes: 2 additions & 12 deletions src/cpp/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@
"bullseye",
"buster",
"jammy",
"focal",
"bionic"
"focal"
],
"build": {
"latest": "bullseye",
"parent": {
"bullseye": "base-debian",
"buster": "base-debian",
"jammy": "base-ubuntu",
"focal": "base-ubuntu",
"bionic": "base-ubuntu"
"focal": "base-ubuntu"
},
"rootDistro": "debian",
"architectures": {
Expand All @@ -31,10 +29,6 @@
],
"focal": [
"linux/amd64"
],
"bionic": [
"linux/amd64",
"linux/arm64"
]
},
"tags": [
Expand Down Expand Up @@ -63,10 +57,6 @@
"cpp:${VERSION}-ubuntu-20.04",
"cpp:${VERSION}-ubuntu20.04",
"cpp:${VERSION}-ubuntu"
],
"bionic": [
"cpp:${VERSION}-ubuntu-18.04",
"cpp:${VERSION}-ubuntu18.04"
]
}
},
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/test-project/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ checkCommon

checkOSPackages "command-line-tools" build-essential cmake cppcheck valgrind clang lldb llvm gdb
checkOSPackages "tools-for-vcpkg" tar curl zip unzip pkg-config bash-completion ninja-build
VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES="stretch bionic"
if [ "$(dpkg --print-architecture)" = "amd64" ] || [[ ! "${VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
if [ "$(dpkg --print-architecture)" = "amd64" ] ; then
check "VCPKG_ROOT" [ -d "${VCPKG_ROOT}" ]
check "VCPKG_DOWNLOAD" [ -d "${VCPKG_DOWNLOADS}" ]
VCPKG_FORCE_SYSTEM_BINARIES=1 check "vcpkg-from-root" ${VCPKG_ROOT}/vcpkg --version
Expand Down
2 changes: 1 addition & 1 deletion src/python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ RUN if ! cat /etc/group | grep -e "^pip-global:" > /dev/null 2>&1; then groupadd
If you would prefer to have multiple Python versions in your container, use `Dockerfile` and update `FROM` statement:

```Dockerfile
FROM ubuntu:bionic
FROM ubuntu:jammy
ARG PYTHON_PACKAGES="python3.5 python3.6 python3.7 python3.8 python3 python3-pip python3-venv"
RUN apt-get update && apt-get install --no-install-recommends -yq software-properties-common \
&& add-apt-repository ppa:deadsnakes/ppa && apt-get update \
Expand Down