Merge branch 'main' into docs-publish

Author: hellt

.deepsource.toml

@@ -3,4 +3,4 @@ templates/** -linguist-detectable
 docs/** -linguist-detectable
 lab-examples/** -linguist-detectable
 # nextui is vendored
-clab/graph_templates/nextui/** linguist-vendored
+core/graph_templates/nextui/** linguist-vendored

.gitattributes

@@ -0,0 +1,30 @@
+This is a Go based repository that contains a cli tool for deploying network os containers to simulate networking topologies. Please follow these guidelines when contributing:
+
+## Code Standards
+
+### Required Before Each Commit
+
+- The code should be formatted with `make format` command.
+
+- The repository uses golangci-lint for linting Go code. Make sure linting passes with `make lint` command when golangci is locally installed or `make clint` when using docker container.
+
+- Testing is done with `make test` command.
+
+## Repository Structure
+- The CLI tool source code is located in the `cmd/` directory.
+- The core library code is located in the `core/` directory.
+- The documentation files are located in the `docs/` directory.
+- The constants files are located in the `constants/` directory.
+- The files responsible to define nodes of the topology are located in the `nodes/` directory.
+- The files responsible to define links of the topology are located in the `links/` directory.
+- The files responsible to container runtime operations are located in the `runtime/` directory.
+- The JSON schema files are located in the `schema/` directory.
+
+## Key Guidelines
+
+1. Follow Go best practices and idiomatic patterns
+2. Maintain existing code structure and organization
+3. Use table-driven tests for functions with multiple scenarios
+4. Use cmp.Diff when writing tests to show differences between expected and actual values.
+5. Write unit tests for new functionality.
+6. Document public APIs and complex logic. Suggest changes to the `docs/` folder when appropriate

.github/copilot-instructions.md

@@ -11,8 +11,8 @@ jobs:
   build-clab:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: WillAbides/setup-go[email protected]
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version: ${{ inputs.go_ver }}
 
@@ -33,7 +33,7 @@ jobs:
         run: make build-with-podman-debug BINARY=containerlab
       # store clab binary as artifact
       - name: Upload containerlab binary
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: containerlab
           path: containerlab

.github/workflows/build-containerlab.yml

@@ -28,37 +28,64 @@ env:
   REGISTRY: ghcr.io
 
 jobs:
-  devcontainer:
-    runs-on: ubuntu-24.04
+  build:
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        variant:
-          - "dind"
-          - "dind-slim"
-          - "dood"
-          - "dood-slim"
         include:
-          - variant: dind
+          # AMD64 builds
+          - platform: "linux/amd64"
+            runner: "ubuntu-24.04"
+            arch-suffix: "amd64"
+            variant: "dind"
+            devContFile: .devcontainer/docker-in-docker/devcontainer.json
+            image-suffix: "-dind"
+          - platform: "linux/amd64"
+            runner: "ubuntu-24.04"
+            arch-suffix: "amd64"
+            variant: "dind-slim"
+            devContFile: .devcontainer/docker-in-docker_slim/devcontainer.json
+            image-suffix: "-dind-slim"
+          - platform: "linux/amd64"
+            runner: "ubuntu-24.04"
+            arch-suffix: "amd64"
+            variant: "dood"
+            devContFile: .devcontainer/docker-outside-of-docker/devcontainer.json
+            image-suffix: "-dood"
+          - platform: "linux/amd64"
+            runner: "ubuntu-24.04"
+            arch-suffix: "amd64"
+            variant: "dood-slim"
+            devContFile: .devcontainer/docker-outside-of-docker_slim/devcontainer.json
+            image-suffix: "-dood-slim"
+          # ARM64 builds
+          - platform: "linux/arm64"
+            runner: "ubuntu-24.04-arm"
+            arch-suffix: "arm64"
+            variant: "dind"
             devContFile: .devcontainer/docker-in-docker/devcontainer.json
             image-suffix: "-dind"
-          - variant: dind-slim
+          - platform: "linux/arm64"
+            runner: "ubuntu-24.04-arm"
+            arch-suffix: "arm64"
+            variant: "dind-slim"
             devContFile: .devcontainer/docker-in-docker_slim/devcontainer.json
             image-suffix: "-dind-slim"
-          - variant: dood
+          - platform: "linux/arm64"
+            runner: "ubuntu-24.04-arm"
+            arch-suffix: "arm64"
+            variant: "dood"
             devContFile: .devcontainer/docker-outside-of-docker/devcontainer.json
             image-suffix: "-dood"
-          - variant: dood-slim
+          - platform: "linux/arm64"
+            runner: "ubuntu-24.04-arm"
+            arch-suffix: "arm64"
+            variant: "dood-slim"
             devContFile: .devcontainer/docker-outside-of-docker_slim/devcontainer.json
             image-suffix: "-dood-slim"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          # workaround for https://github.com/tonistiigi/binfmt/issues/240
-          image: tonistiigi/binfmt:qemu-v7.0.0-28
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -70,21 +97,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # https://github.com/devcontainers/ci/issues/268#issuecomment-1976014578
-      - name: remove existing skopeo
-        run: |
-          sudo rm -rf $(which skopeo)
-
-      - name: Update skopeo
-        run: |
-          REPO_URL="https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_22.04"
-          sudo sh -c "echo 'deb ${REPO_URL}/ /' > /etc/apt/sources.list.d/skopeo.list"
-          curl -fsSL ${REPO_URL}/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/skopeo.gpg > /dev/null
-
-          sudo apt update
-          sudo apt install skopeo
-          skopeo --version
-
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@v5
@@ -102,7 +114,7 @@ jobs:
       - name: Extract tags
         id: extract-tags
         run: |
-          TAGS=$(echo '${{ steps.meta.outputs.tags }}' | awk -F: '{print $2}' | paste -sd "," -)
+          TAGS=$(echo '${{ steps.meta.outputs.tags }}' | awk -F: '{print $2}' | sed "s/$/\-${{ matrix.arch-suffix }}/" | paste -sd "," -)
           echo "TAGS=$TAGS" >> $GITHUB_OUTPUT
         shell: bash
 
@@ -114,5 +126,62 @@ jobs:
           imageName: ghcr.io/${{ github.repository }}/devcontainer${{ matrix.image-suffix }}
           imageTag: ${{ steps.extract-tags.outputs.tags }}
           push: always
-          platform: linux/amd64,linux/arm64
+          platform: ${{ matrix.platform }}
           configFile: ${{ matrix.devContFile }}
+
+  create-manifest:
+    needs: build
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        variant:
+          - name: "dind"
+            image-suffix: "-dind"
+          - name: "dind-slim"
+            image-suffix: "-dind-slim"
+          - name: "dood"
+            image-suffix: "-dood"
+          - name: "dood-slim"
+            image-suffix: "-dood-slim"
+    steps:
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=ref,event=branch
+            type=ref,event=pr
+            # git short commit
+            type=sha
+            # manually set tag
+            type=raw,value=${{ inputs.tag }}
+
+      - name: Extract base tags (without arch suffix)
+        id: extract-tags
+        run: |
+          TAGS=$(echo '${{ steps.meta.outputs.tags }}' | awk -F: '{print $2}' | paste -sd "," -)
+          echo "TAGS=$TAGS" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Create and push manifest
+        run: |
+          for tag in $(echo "${{ steps.extract-tags.outputs.tags }}" | tr ',' '\n'); do
+            IMAGE_BASE="ghcr.io/${{ github.repository }}/devcontainer${{ matrix.variant.image-suffix }}"
+            
+            # Create manifest
+            docker manifest create "${IMAGE_BASE}:${tag}" \
+              --amend "${IMAGE_BASE}:${tag}-amd64" \
+              --amend "${IMAGE_BASE}:${tag}-arm64"
+            
+            # Push manifest
+            docker manifest push "${IMAGE_BASE}:${tag}"
+          done