Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle case where a dangling image is built, and an older SHA is matched during a docker build #140

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Handle case where a dangling image is built, and an older SHA is matched during a docker build #140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfd2188
Handle case where a dangling image is built, and an older SHA is matc…
Oct 9, 2024
6181cc7
Merge branch 'master' into fix-for-dangling-image
marcus-drake Dec 12, 2024
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: 2 additions & 0 deletions src/main/scala/sbtdocker/DockerBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ object DockerBuild {

private val SuccessfullyBuilt = "^Successfully built ([0-9a-f]+)$".r
private val SuccessfullyBuiltBuildKit = ".* writing image sha256:([0-9a-f]+) .*\\bdone$".r
private val SuccessfullyBuiltBuildxDangling = ".* naming to moby-dangling@sha256:([0-9a-f]+) .*\\bdone$".r
private val SuccessfullyBuiltContainerd = ".* exporting manifest list sha256:([0-9a-f]+) .*\\bdone$".r
private val SuccessfullyBuiltBuildx = ".* exporting config sha256:([0-9a-f]+) .*\\bdone$".r
private val SuccessfullyBuiltPodman = "^([0-9a-f]{64})$".r
Expand All @@ -207,6 +208,7 @@ object DockerBuild {
lines.collect {
case SuccessfullyBuilt(id) => ImageId(id)
case SuccessfullyBuiltBuildKit(id) => ImageId(id)
case SuccessfullyBuiltBuildxDangling(id) => ImageId(id)
case SuccessfullyBuiltContainerd(id) => ImageId(id)
case SuccessfullyBuiltBuildx(id) => ImageId(id)
case SuccessfullyBuiltPodman(id) => ImageId(id)
Expand Down
Loading