Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit f2d3ec2

Browse files
Chuxeljoshspicer
Chuxel
and
joshspicer
authored
Prep for Ubuntu 22.04/Jammy release (including C++ definitions) (#1399)
* Ubuntu 22.04/Jammy * Adjust C++ definitions for Ubuntu Jammy * Stick with codenames for image generation * Stick with codenames for image generation * Fix references * bump manifest for cpp Co-authored-by: Josh Spicer <[email protected]>
1 parent ac0a543 commit f2d3ec2

File tree

15 files changed

+50
-46
lines changed

15 files changed

+50
-46
lines changed

‎build/config.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
"https://dl.yarnpkg.com/debian": "https://dl.yarnpkg.com/debian/pubkey.gpg",
4141
"https://packages.microsoft.com/repos/microsoft-debian-stretch-prod": "https://packages.microsoft.com/keys/microsoft.asc",
4242
"https://packages.microsoft.com/repos/microsoft-debian-buster-prod": "https://packages.microsoft.com/keys/microsoft.asc",
43+
"https://packages.microsoft.com/repos/microsoft-debian-bullseye-prod": "https://packages.microsoft.com/keys/microsoft.asc",
4344
"https://packages.microsoft.com/repos/microsoft-ubuntu-focal-prod": "https://packages.microsoft.com/keys/microsoft.asc",
4445
"https://packages.microsoft.com/repos/microsoft-ubuntu-bionic-prod": "https://packages.microsoft.com/keys/microsoft.asc",
46+
"https://packages.microsoft.com/repos/microsoft-ubuntu-jammy-prod": "https://packages.microsoft.com/keys/microsoft.asc",
4547
"https://packages.microsoft.com/repos/azure-cli": "https://packages.microsoft.com/keys/microsoft.asc",
4648
"http://archive.ubuntu.com/ubuntu": "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg",
4749
"http://security.ubuntu.com/ubuntu": "http://security.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg",

‎containers/cpp-mariadb/.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/9, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
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
22
ARG VARIANT=debian-11
33
FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT}
44

‎containers/cpp-mariadb/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Docker Compose |
1212
| *Available image variants* | [See cpp definition](../cpp). |
13-
| *Supported architecture(s)* | x86-64, aarch64/arm64 for `bullseye`, `stretch`, `bionic`, and `hirsute` variants |
13+
| *Supported architecture(s)* | x86-64, aarch64/arm64 for `debian-11`, `ubuntu-22.04`, and `ubuntu-18.04` variants |
1414
| *Works in Codespaces* | Yes |
1515
| *Container host OS support* | Linux, macOS, Windows |
1616
| *Container OS* | Debian, Ubuntu |

‎containers/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/21.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
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
22
ARG VARIANT=debian-11
33
FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT}
44

‎containers/cpp/.devcontainer/base.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/21.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
2-
ARG VARIANT=debian-10
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
2+
ARG VARIANT=debian-11
33
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
44

55
# Install needed packages. Use a separate RUN statement to add your own dependencies.

‎containers/cpp/.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "C++",
33
"build": {
44
"dockerfile": "Dockerfile",
5-
// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-11, debian-10, debian-9, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04
6-
// Use Debian 11, Debian 9, Ubuntu 18.04 or Ubuntu 21.04 on local arm64/Apple Silicon
5+
// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
6+
// Use Debian 11, Ubuntu 18.04 or Ubuntu 22.04 on local arm64/Apple Silicon
77
"args": { "VARIANT": "debian-11" }
88
},
99
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],

‎containers/cpp/README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Dockerfile |
1212
| *Published images* | mcr.microsoft.com/vscode/devcontainers/cpp |
13-
| *Available image variants* | buster, bullseye, bionic, focal, hirsute ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/cpp/tags/list)) |
14-
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye`, `bionic`, and `hirsute` variants |
13+
| *Available image variants* | debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04 ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/cpp/tags/list)) |
14+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-11`, `ubuntu-22.04`, and `ubuntu-18.04` variants |
1515
| *Works in Codespaces* | Yes |
1616
| *Container host OS support* | Linux, macOS, Windows |
1717
| *Container OS* | Debian, Ubuntu |
@@ -24,27 +24,27 @@ See **[history](history)** for information on the contents of published images.
2424
While the definition itself works unmodified, you can select the version of Debian or Ubuntu the container uses by updating the `VARIANT` arg in the included `devcontainer.json` (and rebuilding if you've already created the container).
2525

2626
```json
27-
"args": { "VARIANT": "bullseye" }
27+
"args": { "VARIANT": "debian-11" }
2828
```
2929

3030
You can also directly reference pre-built versions of `.devcontainer/base.Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
3131

3232
- `mcr.microsoft.com/vscode/devcontainers/cpp` (latest Debian GA)
3333
- `mcr.microsoft.com/vscode/devcontainers/cpp:debian` (latest Debian GA)
34-
- `mcr.microsoft.com/vscode/devcontainers/cpp:bullseye` (or `debian-11`)
35-
- `mcr.microsoft.com/vscode/devcontainers/cpp:buster` (or `debian-10`)
34+
- `mcr.microsoft.com/vscode/devcontainers/cpp:debian-11` (or `bullseye`)
35+
- `mcr.microsoft.com/vscode/devcontainers/cpp:debian-10` (or `buster`)
3636
- `mcr.microsoft.com/vscode/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)
37-
- `mcr.microsoft.com/vscode/devcontainers/cpp:hirsute` (or `ubuntu-21.04`)
38-
- `mcr.microsoft.com/vscode/devcontainers/cpp:focal` (or `ubuntu-20.04`)
39-
- `mcr.microsoft.com/vscode/devcontainers/cpp:bionic` (or `ubuntu-18.04`)
37+
- `mcr.microsoft.com/vscode/devcontainers/cpp:ubuntu-22.04` (or `jammy`)
38+
- `mcr.microsoft.com/vscode/devcontainers/cpp:ubuntu-20.04` (or `focal`)
39+
- `mcr.microsoft.com/vscode/devcontainers/cpp:ubuntu-18.04` (or `bionic`)
4040

4141
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
4242

4343
- `mcr.microsoft.com/vscode/devcontainers/cpp:0-bullseye`
44-
- `mcr.microsoft.com/vscode/devcontainers/cpp:0.203-bullseye`
45-
- `mcr.microsoft.com/vscode/devcontainers/cpp:0.203.0-bullseye`
44+
- `mcr.microsoft.com/vscode/devcontainers/cpp:0.204-bullseye`
45+
- `mcr.microsoft.com/vscode/devcontainers/cpp:0.204.0-bullseye`
4646

47-
However, we only do security patching on the latest [non-breaking, in support](https://github.com/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-bullseye`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
47+
However, we only do security patching on the latest [non-breaking, in support](https://github.com/microsoft/vscode-dev-containers/issues/532) versions of images (e.g. `0-debian-11`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
4848

4949
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/vscode/devcontainers/cpp/tags/list).
5050

‎containers/cpp/definition-manifest.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
{
2-
"variants": ["bullseye", "buster", "hirsute", "focal", "bionic", "stretch"],
3-
"definitionVersion": "0.204.0",
2+
"variants": ["bullseye", "buster", "jammy", "focal", "bionic"],
3+
"definitionVersion": "0.205.0",
44
"build": {
55
"latest": "bullseye",
66
"parent": {
77
"bullseye": "debian",
88
"buster": "debian",
9-
"stretch": "debian",
10-
"hirsute": "ubuntu",
9+
"jammy": "ubuntu",
1110
"focal": "ubuntu",
1211
"bionic": "ubuntu"
1312
},
1413
"rootDistro": "debian",
1514
"architectures": {
1615
"bullseye": ["linux/amd64", "linux/arm64"],
1716
"buster": ["linux/amd64"],
18-
"stretch": ["linux/amd64", "linux/arm64"],
19-
"hirsute": ["linux/amd64", "linux/arm64"],
17+
"jammy": ["linux/amd64", "linux/arm64"],
2018
"focal": ["linux/amd64"],
2119
"bionic": ["linux/amd64", "linux/arm64"]
2220
},
@@ -38,6 +36,10 @@
3836
"cpp:${VERSION}-debian-9",
3937
"cpp:${VERSION}-debian9"
4038
],
39+
"jammy": [
40+
"cpp:${VERSION}-ubuntu-22.04",
41+
"cpp:${VERSION}-ubuntu22.04"
42+
],
4143
"hirsute": [
4244
"cpp:${VERSION}-ubuntu-21.04",
4345
"cpp:${VERSION}-ubuntu21.04"

‎containers/ubuntu/.devcontainer/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic
2-
ARG VARIANT=focal
3-
FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
1+
# [Choice] Ubuntu version (use ubuntu-22.04 or ubuntu-18.04 on local arm64/Apple Silicon): ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
2+
ARG VARIANT=ubuntu-20.04
3+
FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
44

55
# [Optional] Uncomment this section to install additional OS packages.
66
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

‎containers/ubuntu/.devcontainer/base.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Ubuntu version (use hirsute or bionic on local arm64/Apple Silicon): hirsute, focal, bionic
1+
# [Choice] Ubuntu version (use jammy or bionic on local arm64/Apple Silicon): jammy, focal, bionic
22
ARG VARIANT="focal"
33
FROM buildpack-deps:${VARIANT}-curl
44

0 commit comments

Comments
 (0)