Skip to content

Commit bd4969f

Browse files
committed
fix: restructure templates for devcontainer CLI compatibility
Templates now have .devcontainer subfolder as required by the spec
1 parent c815de5 commit bd4969f

6 files changed

Lines changed: 14 additions & 12 deletions

File tree

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

.github/workflows/build-container.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
- name: Find all Dockerfiles
2828
id: find
2929
run: |
30-
# Find all directories containing a Dockerfile
31-
CONTAINERS=$(find .devcontainer -mindepth 2 -name "Dockerfile" -printf '%h\n' | \
32-
sed 's|.devcontainer/||' | \
30+
# Find all template directories containing a Dockerfile
31+
CONTAINERS=$(find .devcontainer -mindepth 3 -name "Dockerfile" -printf '%h\n' | \
32+
sed 's|.devcontainer/||' | sed 's|/.devcontainer||' | \
3333
jq -R -s -c 'split("\n") | map(select(length > 0))')
3434
echo "containers=$CONTAINERS" >> $GITHUB_OUTPUT
3535
echo "Found containers: $CONTAINERS"
@@ -182,8 +182,8 @@ jobs:
182182
- name: Build and push
183183
uses: docker/build-push-action@v5
184184
with:
185-
context: .devcontainer/${{ matrix.container }}
186-
file: .devcontainer/${{ matrix.container }}/Dockerfile
185+
context: .devcontainer/${{ matrix.container }}/.devcontainer
186+
file: .devcontainer/${{ matrix.container }}/.devcontainer/Dockerfile
187187
push: true
188188
tags: ${{ steps.meta.outputs.tags }}
189189
labels: |

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ Dev Container templates with Claude Code pre-installed on Debian 13 (Trixie).
3030

3131
### Option 2: Copy the devcontainer folder
3232

33-
Copy the desired template folder from `.devcontainer/` to your project:
33+
Copy the desired template's `.devcontainer` folder to your project:
3434

3535
```bash
3636
# For base template
37-
cp -r .devcontainer/base /your-project/.devcontainer
37+
cp -r .devcontainer/base/.devcontainer /your-project/.devcontainer
3838

3939
# For BMAD template
40-
cp -r .devcontainer/base-with-bmad /your-project/.devcontainer
40+
cp -r .devcontainer/base-with-bmad/.devcontainer /your-project/.devcontainer
4141
```
4242

4343
### Option 3: Use the image directly
@@ -103,12 +103,14 @@ echo $GITHUB_TOKEN | docker login ghcr.io -u USERNAME --password-stdin
103103
.
104104
├── .devcontainer/
105105
│ ├── base/
106-
│ │ ├── Dockerfile
107-
│ │ ├── devcontainer.json
106+
│ │ ├── .devcontainer/
107+
│ │ │ ├── Dockerfile
108+
│ │ │ └── devcontainer.json
108109
│ │ └── devcontainer-template.json
109110
│ └── base-with-bmad/
110-
│ ├── Dockerfile
111-
│ ├── devcontainer.json
111+
│ ├── .devcontainer/
112+
│ │ ├── Dockerfile
113+
│ │ └── devcontainer.json
112114
│ └── devcontainer-template.json
113115
├── .github/
114116
│ └── workflows/

0 commit comments

Comments
 (0)