Skip to content

Commit 095f243

Browse files
authored
Merge pull request #31 from opensafely/evansd/fix-build
Fix build failures by updating Debian base image
2 parents f04c1bc + e1d9198 commit 095f243

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/python:3.13-bullseye
1+
FROM mcr.microsoft.com/devcontainers/python:3.13-trixie
22

33
# Suppress the codespace's default first run message
44
# See https://github.com/devcontainers/features/blob/main/src/common-utils/scripts/rc_snippet.sh

.devcontainer/devcontainer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
},
1212
// Features to add to the dev container. More info: https://containers.dev/features.
1313
"features": {
14-
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
14+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
15+
// This is incompatible with the Debian Trixie image we are using
16+
// See: https://github.com/opensafely/ehrql-tutorial/pull/31
17+
"moby": false
18+
}
1519
},
1620
// Use 'forwardPorts' to make a list of ports inside the container available locally.
1721
// "forwardPorts": [],

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
env:
2424
SLACK_BOT_TOKEN: ${{ secrets.BENNETTBOT_SLACK_BOT_TOKEN }}
2525
with:
26-
channel_id: C069YDR4NCA
26+
channel_id: C0A8WAJMK0S
2727
status: "Scheduled dev container test run failure"
2828
color: danger

0 commit comments

Comments
 (0)