From f8f98a41420e7c8927a87de9fd88e5890bd1794d Mon Sep 17 00:00:00 2001 From: Ivan Pepelnjak Date: Wed, 23 Sep 2026 10:53:00 +0200 Subject: [PATCH 1/2] Update devcontainer build file * Add vscode user to clab_admins group to enable sudoless containerlab * Change the base image to Python 3.14 * Fix an obsolete LABEL line --- .devcontainer/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 30b725c61b..40731146c5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/devcontainers/python:3.11-bookworm +FROM mcr.microsoft.com/devcontainers/python:3.14 ARG PIP_OPTIONS ENV PIP_OPTIONS=${PIP_OPTIONS} ENV NETLAB_DEVICES_FRR_CLAB_GROUP__VARS_NETLAB__MGMT__VRF=False ENV ANSIBLE_CONFIG=./ansible.cfg -LABEL org.opencontainers.image.source https://github.com/ipspace/netlab +LABEL org.opencontainers.image.source=https://github.com/ipspace/netlab RUN echo "deb [trusted=yes] https://netdevops.fury.site/apt/ /" | \ tee -a /etc/apt/sources.list.d/netdevops.list @@ -42,7 +42,8 @@ USER vscode # create ssh key for vscode user to enable passwordless ssh to devices RUN ssh-keygen -t ecdsa -b 256 -N "" -f ~/.ssh/id_ecdsa && \ mkdir -p /home/vscode/.docker && \ - echo "{}" > /home/vscode/.docker/config.json + echo "{}" > /home/vscode/.docker/config.json && \ + sudo usermod -a -G clab_admins vscode # setup zsh #COPY ./.devcontainer/zsh/.zshrc /home/vscode/.zshrc From c0294f42a39c23100a208fe86b2f6b9ed0bbde82 Mon Sep 17 00:00:00 2001 From: Ivan Pepelnjak Date: Wed, 23 Sep 2026 10:59:59 +0200 Subject: [PATCH 2/2] Fix: use Docker CE for docker-in-docker --- .devcontainer/devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 25981fc34d..eff8a5fbe0 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,6 +13,7 @@ "features": { "ghcr.io/devcontainers/features/docker-in-docker:4": { "version": "latest", + "moby": false, "enableNonRootDocker": "true" }, "ghcr.io/devcontainers/features/sshd:1": {