From 15f03839287fb21f9cc40a77cfd5ba3b4796f69a Mon Sep 17 00:00:00 2001 From: jupblb Date: Fri, 13 Feb 2026 00:47:23 +0000 Subject: [PATCH] Upgrade sbt-docker from 1.9.0 to 1.11.0 Fixes Docker CLI test CI failure caused by newer Docker Engine / BuildKit no longer printing 'Successfully built ', which sbt-docker's regex couldn't parse (DockerBuildException: Could not parse Docker image id). --- .github/workflows/ci.yml | 3 +-- .github/workflows/release-docker.yml | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22ff646ae..218819a80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - uses: sbt/setup-sbt@v1 - name: Build Dockerised CLI - run: sbt cli/docker + run: DOCKER_BUILDKIT=0 sbt cli/docker - name: Test repos shell: bash @@ -172,4 +172,3 @@ jobs: - run: du -h index.scip working-directory: examples/maven-example - diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index 1b2c2ceb7..48bc632e5 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -23,4 +23,4 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - run: sbt cli/dockerBuildAndPush + - run: DOCKER_BUILDKIT=0 sbt cli/dockerBuildAndPush diff --git a/project/plugins.sbt b/project/plugins.sbt index 879d454bf..b44c03e38 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.14") -addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.9.0") +addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.11.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")