Skip to content
Merged
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The devcontainer should use the developer target and run as root with podman
# or docker with user namespaces.
<<<<<<< before updating
FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble@sha256:0b3df78da03f1cca04cdc0b607c60a8ad100efcb6b8b5afba589c81dab3e6d47 AS developer
FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble@sha256:f7fa4c496ab28ebbb919e896fa91a69968831a43270a6d3dd33dec49ad44e9da AS developer
=======
FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:resolute AS developer
>>>>>>> after updating
Expand Down