From d9167c68b7c8d5a4acc000d19608f4424b2f0167 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Mon, 16 Feb 2026 09:43:55 +0100
Subject: [PATCH 1/3] 0.83.1

---
 CHANGELOG.md | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 598cb3e03..605480c58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Notable changes.
 
 ## February 2026
 
+### [0.83.1]
+- Bump tar from 7.5.6 to 7.5.7. (https://github.com/devcontainers/cli/pull/1140)
+
 ### [0.83.0]
 - Add install script. (https://github.com/devcontainers/cli/pull/1142)
 - Remove request body limit. (https://github.com/devcontainers/cli/pull/1141)
diff --git a/package.json b/package.json
index 81a4d54ba..ae348ed35 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.83.0",
+	"version": "0.83.1",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},

From 7185020a8ab71ec6bad2caca1c736fc32ae8f10a Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 17 Feb 2026 10:20:48 +0100
Subject: [PATCH 2/3] Disable containerd image store

---
 .github/workflows/dev-containers.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/dev-containers.yml b/.github/workflows/dev-containers.yml
index d1f43995e..14f44861d 100644
--- a/.github/workflows/dev-containers.yml
+++ b/.github/workflows/dev-containers.yml
@@ -69,6 +69,20 @@ jobs:
         node-version: '18.x'
         registry-url: 'https://npm.pkg.github.com'
         scope: '@microsoft'
+    - name: Disable containerd image store
+      run: |
+        # Workaround for https://github.com/moby/moby/issues/52050
+        DAEMON_JSON="/etc/docker/daemon.json"
+        if [ -f "$DAEMON_JSON" ]; then
+          sudo jq '. + {"features": {"containerd-snapshotter": false}}' "$DAEMON_JSON" \
+            | sudo tee "${DAEMON_JSON}.tmp" > /dev/null
+          sudo mv "${DAEMON_JSON}.tmp" "$DAEMON_JSON"
+        else
+          echo '{"features": {"containerd-snapshotter": false}}' \
+            | sudo tee "$DAEMON_JSON" > /dev/null
+        fi
+        cat "$DAEMON_JSON"
+        sudo systemctl restart docker
     - name: Tools Info
       run: |
         docker info

From afddf1a64d08670e1c5acae2fa8d0f6bd7a9c380 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Tue, 17 Feb 2026 10:20:56 +0100
Subject: [PATCH 3/3] Pin buildx version

---
 .github/workflows/test-docker-v20.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-docker-v20.yml b/.github/workflows/test-docker-v20.yml
index e38817420..8e8c64dfc 100644
--- a/.github/workflows/test-docker-v20.yml
+++ b/.github/workflows/test-docker-v20.yml
@@ -33,7 +33,11 @@ jobs:
           "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
           $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
         sudo apt-get update
-        sudo apt-get install -y docker-ce=5:20.10.* docker-ce-cli=5:20.10.* containerd.io
+        # Pin buildx < 0.31.0 to avoid API version 1.52 incompatibility with Docker 20.10 (max API 1.41)
+        # See https://github.com/docker/buildx/issues/3654
+        BUILDX_VERSION=$(apt-cache madison docker-buildx-plugin | awk '{print $3}' | grep -v '^0\.3[1-9]\.' | head -1)
+        echo "Installing docker-buildx-plugin=$BUILDX_VERSION"
+        sudo apt-get install -y docker-ce=5:20.10.* docker-ce-cli=5:20.10.* containerd.io docker-buildx-plugin="$BUILDX_VERSION" docker-compose-plugin
         sudo systemctl restart docker
     
     - name: Verify Docker version, Install and Test