From 545563d6de6801f1b07a5418ba31bf643f26df31 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Tue, 31 Aug 2021 23:47:38 +0000 Subject: [PATCH 1/4] Add arm64 to bullseye, stretch images --- containers/debian/README.md | 2 +- containers/debian/definition-manifest.json | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/containers/debian/README.md b/containers/debian/README.md index 845b083140..ef7377d2f4 100644 --- a/containers/debian/README.md +++ b/containers/debian/README.md @@ -11,7 +11,7 @@ | *Definition type* | Dockerfile | | *Published images* | mcr.microsoft.com/vscode/devcontainers/base:debian | | *Available image variants* | stretch, buster, bullseye ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) | -| *Published image architecture(s)* | x86-64 | +| *Published image architecture(s)* | x86-64, aarch64/arm64 for `bullseye` and `stretch` variants | | *Works in Codespaces* | Yes | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian | diff --git a/containers/debian/definition-manifest.json b/containers/debian/definition-manifest.json index 6a114579ce..29488b0c3d 100644 --- a/containers/debian/definition-manifest.json +++ b/containers/debian/definition-manifest.json @@ -1,22 +1,27 @@ { "variants": ["buster", "bullseye", "stretch"], - "definitionVersion": "0.202.1", + "definitionVersion": "0.202.2", "build": { - "latest": true, + "latest": "bullseye", "rootDistro": "debian", + "architectures": { + "bullseye": ["linux/amd64", "linux/arm64"], + "buster": ["linux/amd64"], + "stretch": ["linux/amd64", "linux/arm64"] + }, "tags": [ "base:${VERSION}-${VARIANT}" ], "variantTags": { "bullseye": [ "base:${VERSION}-debian-11", - "base:${VERSION}-debian11" + "base:${VERSION}-debian11", + "base:${VERSION}-debian", + "base:${VERSION}" ], "buster": [ "base:${VERSION}-debian-10", - "base:${VERSION}-debian10", - "base:${VERSION}-debian", - "base:${VERSION}" + "base:${VERSION}-debian10" ], "stretch": [ "base:${VERSION}-debian-9", From a939f0a15cfe4c359d98195e79cb1a0c6630735e Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Tue, 31 Aug 2021 23:50:02 +0000 Subject: [PATCH 2/4] Add arm64 to bionic, new hirsuite image --- containers/ubuntu/.devcontainer/Dockerfile | 2 +- containers/ubuntu/.devcontainer/base.Dockerfile | 2 +- containers/ubuntu/.devcontainer/devcontainer.json | 2 +- containers/ubuntu/README.md | 11 ++++++----- containers/ubuntu/definition-manifest.json | 15 ++++++++++++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/containers/ubuntu/.devcontainer/Dockerfile b/containers/ubuntu/.devcontainer/Dockerfile index e05f83cc71..421476b5d2 100644 --- a/containers/ubuntu/.devcontainer/Dockerfile +++ b/containers/ubuntu/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -# [Choice] Ubuntu version: bionic, focal +# [Choice] Ubuntu version: hirsute, bionic, focal ARG VARIANT=focal FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT} diff --git a/containers/ubuntu/.devcontainer/base.Dockerfile b/containers/ubuntu/.devcontainer/base.Dockerfile index f7715bcb18..07d3d085fa 100644 --- a/containers/ubuntu/.devcontainer/base.Dockerfile +++ b/containers/ubuntu/.devcontainer/base.Dockerfile @@ -1,4 +1,4 @@ -# Update the VARIANT arg in devcontainer.json to pick an Ubuntu version: focal, bionic +# Update the VARIANT arg in devcontainer.json to pick an Ubuntu version: hirsute, focal, bionic ARG VARIANT="focal" FROM buildpack-deps:${VARIANT}-curl diff --git a/containers/ubuntu/.devcontainer/devcontainer.json b/containers/ubuntu/.devcontainer/devcontainer.json index 50a09a78ad..521c17760e 100644 --- a/containers/ubuntu/.devcontainer/devcontainer.json +++ b/containers/ubuntu/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Ubuntu", "build": { "dockerfile": "Dockerfile", - // Update 'VARIANT' to pick an Ubuntu version: focal, bionic + // Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic "args": { "VARIANT": "focal" } }, diff --git a/containers/ubuntu/README.md b/containers/ubuntu/README.md index 2e86c85feb..1cb8c7445f 100644 --- a/containers/ubuntu/README.md +++ b/containers/ubuntu/README.md @@ -10,8 +10,8 @@ | *Categories* | Core, Other | | *Definition type* | Dockerfile | | *Published images* | mcr.microsoft.com/vscode/devcontainers/base:ubuntu | -| *Available image variants* | bionic, focal ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) | -| *Published image architecture(s)* | x86-64 | +| *Available image variants* | hirsute, focal, bionic ([full list](https://mcr.microsoft.com/v2/vscode/devcontainers/base/tags/list)) | +| *Published image architecture(s)* | x86-64, aarch64/arm64 for `hirsute` (21.04) and `bionic` (18.04) variants | | *Works in Codespaces* | Yes | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Ubuntu | @@ -29,15 +29,16 @@ While the definition itself works unmodified, you can select the version of Ubun 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. -- `mcr.microsoft.com/vscode/devcontainers/base:ubuntu` (latest) +- `mcr.microsoft.com/vscode/devcontainers/base:ubuntu` (latest LTS release) +- `mcr.microsoft.com/vscode/devcontainers/base:hirsute` (or `ubuntu-21.04`) - `mcr.microsoft.com/vscode/devcontainers/base:focal` (or `ubuntu-20.04`) - `mcr.microsoft.com/vscode/devcontainers/base:bionic` (or `ubuntu-18.04`) You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example: - `mcr.microsoft.com/vscode/devcontainers/base:0-focal` -- `mcr.microsoft.com/vscode/devcontainers/base:0.201-focal` -- `mcr.microsoft.com/vscode/devcontainers/base:0.201.4-focal` +- `mcr.microsoft.com/vscode/devcontainers/base:0.202-focal` +- `mcr.microsoft.com/vscode/devcontainers/base:0.202.0-focal` 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/base/tags/list). diff --git a/containers/ubuntu/definition-manifest.json b/containers/ubuntu/definition-manifest.json index 2845b04495..00ad777ec6 100644 --- a/containers/ubuntu/definition-manifest.json +++ b/containers/ubuntu/definition-manifest.json @@ -1,13 +1,22 @@ { - "variants": ["focal", "bionic"], - "definitionVersion": "0.201.9", + "variants": ["hirsute", "focal", "bionic"], + "definitionVersion": "0.202.0", "build": { - "latest": false, + "latest": "focal", "rootDistro": "debian", + "architectures": { + "hirsute": ["linux/amd64", "linux/arm64"], + "focal": ["linux/amd64"], + "bionic": ["linux/amd64", "linux/arm64"] + }, "tags": [ "base:${VERSION}-${VARIANT}" ], "variantTags": { + "hirsute": [ + "base:${VERSION}-ubuntu-21.04", + "base:${VERSION}-ubuntu21.04" + ], "focal": [ "base:${VERSION}-ubuntu-20.04", "base:${VERSION}-ubuntu20.04", From ba169571dea5593f2cf2f2eb5096162768204145 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Tue, 31 Aug 2021 23:50:17 +0000 Subject: [PATCH 3/4] Increase CI concurrency --- .github/workflows/push-and-package.yml | 4 ++-- .github/workflows/push-dev.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-and-package.yml b/.github/workflows/push-and-package.yml index e79deafbb7..4b642c9784 100644 --- a/.github/workflows/push-and-package.yml +++ b/.github/workflows/push-and-package.yml @@ -11,8 +11,8 @@ jobs: name: Build and push images strategy: matrix: - page: [1, 2, 3, 4, 5] - page-total: [5] + page: [1, 2, 3, 4, 5, 6] + page-total: [6] fail-fast: false runs-on: ubuntu-latest steps: diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml index 36b586ce41..d0f30a3200 100644 --- a/.github/workflows/push-dev.yml +++ b/.github/workflows/push-dev.yml @@ -30,8 +30,8 @@ jobs: if: "!contains(github.event.head_commit.message, 'Automated update') && !contains(github.event.head_commit.message, 'CI ignore')" strategy: matrix: - page: [1, 2, 3, 4] - page-total: [4] + page: [1, 2, 3, 4, 5] + page-total: [5] fail-fast: true runs-on: ubuntu-latest steps: From 481e6743dcbd858a745995bee3c6b201f7f702c7 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Wed, 1 Sep 2021 00:20:13 +0000 Subject: [PATCH 4/4] latest should be false for ubuntu --- containers/ubuntu/definition-manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers/ubuntu/definition-manifest.json b/containers/ubuntu/definition-manifest.json index 00ad777ec6..e19e5a65fc 100644 --- a/containers/ubuntu/definition-manifest.json +++ b/containers/ubuntu/definition-manifest.json @@ -2,7 +2,7 @@ "variants": ["hirsute", "focal", "bionic"], "definitionVersion": "0.202.0", "build": { - "latest": "focal", + "latest": false, "rootDistro": "debian", "architectures": { "hirsute": ["linux/amd64", "linux/arm64"],