Skip to content

Commit 7b95b63

Browse files
Cpp: Ubuntu 18.04 (bionic) - End of Standard Support (#588)
1 parent 220ba5d commit 7b95b63

File tree

8 files changed

+12
-27
lines changed

8 files changed

+12
-27
lines changed

.github/workflows/push-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: "github.ref == 'refs/heads/main'"
1212
strategy:
1313
matrix:
14-
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]
15-
page-total: [51]
14+
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]
15+
page-total: [50]
1616
fail-fast: false
1717
runs-on: devcontainer-image-builder-ubuntu
1818
steps:

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
if: ${{ github.event.base_ref == 'refs/heads/main' }}
1212
strategy:
1313
matrix:
14-
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]
15-
page-total: [51]
14+
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]
15+
page-total: [50]
1616
fail-fast: false
1717
runs-on: devcontainer-image-builder-ubuntu
1818
steps:

src/cpp/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [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
1+
# [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
22
ARG VARIANT=debian-11
33
FROM mcr.microsoft.com/devcontainers/base:0-${VARIANT}
44
USER root

src/cpp/.devcontainer/base-scripts/install-vcpkg.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,10 @@ set -e
88

99
USERNAME=${1:-"vscode"}
1010

11-
# bionic and stretch pkg repos install cmake version < 3.15 which is required to run bootstrap-vcpkg.sh on ARM64
12-
VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES="stretch bionic"
13-
1411
. /etc/os-release
1512

1613
# Exit early if ARM64 OS does not have cmake version required to build Vcpkg
17-
if [ "$(dpkg --print-architecture)" = "arm64" ] && [[ "${VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
14+
if [ "$(dpkg --print-architecture)" = "arm64" ]; then
1815
echo "OS ${VERSION_CODENAME} ARM64 pkg repo installs cmake version < 3.15, which is required to build Vcpkg."
1916
exit 0
2017
fi

src/cpp/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/cpp |
12-
| *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)) |
13-
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-11`, `ubuntu-22.04`, and `ubuntu-18.04` variants |
12+
| *Available image variants* | debian-11, debian-10, ubuntu-22.04, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-11`,and `ubuntu-22.04` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian, Ubuntu |
1616
| *Languages, platforms* | C++ |
@@ -28,7 +28,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2828
- `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)
2929
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04` (or `jammy`)
3030
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04` (or `focal`)
31-
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-18.04` (or `bionic`)
3231

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

src/cpp/manifest.json

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
"bullseye",
55
"buster",
66
"jammy",
7-
"focal",
8-
"bionic"
7+
"focal"
98
],
109
"build": {
1110
"latest": "bullseye",
1211
"parent": {
1312
"bullseye": "base-debian",
1413
"buster": "base-debian",
1514
"jammy": "base-ubuntu",
16-
"focal": "base-ubuntu",
17-
"bionic": "base-ubuntu"
15+
"focal": "base-ubuntu"
1816
},
1917
"rootDistro": "debian",
2018
"architectures": {
@@ -31,10 +29,6 @@
3129
],
3230
"focal": [
3331
"linux/amd64"
34-
],
35-
"bionic": [
36-
"linux/amd64",
37-
"linux/arm64"
3832
]
3933
},
4034
"tags": [
@@ -63,10 +57,6 @@
6357
"cpp:${VERSION}-ubuntu-20.04",
6458
"cpp:${VERSION}-ubuntu20.04",
6559
"cpp:${VERSION}-ubuntu"
66-
],
67-
"bionic": [
68-
"cpp:${VERSION}-ubuntu-18.04",
69-
"cpp:${VERSION}-ubuntu18.04"
7060
]
7161
}
7262
},

src/cpp/test-project/test.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ checkCommon
1111

1212
checkOSPackages "command-line-tools" build-essential cmake cppcheck valgrind clang lldb llvm gdb
1313
checkOSPackages "tools-for-vcpkg" tar curl zip unzip pkg-config bash-completion ninja-build
14-
VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES="stretch bionic"
15-
if [ "$(dpkg --print-architecture)" = "amd64" ] || [[ ! "${VCPKG_UNSUPPORTED_ARM64_VERSION_CODENAMES}" = *"${VERSION_CODENAME}"* ]]; then
14+
if [ "$(dpkg --print-architecture)" = "amd64" ] ; then
1615
check "VCPKG_ROOT" [ -d "${VCPKG_ROOT}" ]
1716
check "VCPKG_DOWNLOAD" [ -d "${VCPKG_DOWNLOADS}" ]
1817
VCPKG_FORCE_SYSTEM_BINARIES=1 check "vcpkg-from-root" ${VCPKG_ROOT}/vcpkg --version

src/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ RUN if ! cat /etc/group | grep -e "^pip-global:" > /dev/null 2>&1; then groupadd
128128
If you would prefer to have multiple Python versions in your container, use `Dockerfile` and update `FROM` statement:
129129

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

0 commit comments

Comments
 (0)