Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/test-pr-arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
paths:
- "src/powershell/**"
- "test/powershell/**"
- "src/docker-in-docker/**"
- "test/docker-in-docker/**"

jobs:
detect-changes:
Expand All @@ -23,7 +25,7 @@ jobs:
# <feature-name>: ./**/<feature-name>/**
filters: |
powershell: ./**/powershell/**

docker-in-docker: ./**/docker-in-docker/**
test:
needs: [detect-changes]
runs-on: ubuntu-24.04-arm
Expand All @@ -42,9 +44,14 @@ jobs:
"mcr.microsoft.com/devcontainers/base:debian",
"mcr.microsoft.com/devcontainers/base:noble"
]
exclude:
- features: docker-in-docker
baseImage: mcr.microsoft.com/devcontainers/base:debian
steps:
- uses: actions/checkout@v6

- run: sudo modprobe erofs && grep erofs /proc/filesystems

- name: "Install latest devcontainer CLI"
run: npm install -g @devcontainers/cli

Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/test-pr-macos.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: "PR - Test Updated Features (macOS)"
on:
pull_request:
# NOTE: To extend this workflow to other features, add path entries below
# following the same pattern, e.g.:
# - "src/<feature-name>/**"
# - "test/<feature-name>/**"
paths:
- "src/docker-in-docker/**"
- "test/docker-in-docker/**"

jobs:
detect-changes:
runs-on: ubuntu-latest
outputs:
features: ${{ steps.filter.outputs.changes }}
steps:
- uses: dorny/paths-filter@v4
id: filter
with:
# NOTE: To extend this workflow to other features, add filter entries below
# following the same pattern, e.g.:
# <feature-name>: ./**/<feature-name>/**
filters: |
docker-in-docker: ./**/docker-in-docker/**

test:
needs: [detect-changes]
runs-on: macos-latest
continue-on-error: true
strategy:
matrix:
features: ${{ fromJSON(needs.detect-changes.outputs.features) }}
baseImage:
[
"ubuntu:noble",
"debian:12",
"mcr.microsoft.com/devcontainers/base:ubuntu",
"mcr.microsoft.com/devcontainers/base:debian",
"mcr.microsoft.com/devcontainers/base:noble"
]
steps:
- uses: actions/checkout@v6

- name: "Install Docker on macOS runner"
uses: douglascamata/setup-docker-macos-action@v1-alpha

- name: "Verify Docker"
run: docker version

- name: "Install latest devcontainer CLI"
run: npm install -g @devcontainers/cli

- name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
run: devcontainer features test --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
2 changes: 1 addition & 1 deletion src/docker-in-docker/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "docker-in-docker",
"version": "2.16.1",
"version": "2.16.4",
"name": "Docker (Docker-in-Docker)",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
"description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
Expand Down
Loading