This is an automated email from the ASF dual-hosted git repository.
thiagoelg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 40b3289b7a6 kie-tools#3441: [docker images] docker-squash not saving
images when they are larger (#3442)
40b3289b7a6 is described below
commit 40b3289b7a69458fe7d9da370351c249350fd7d6
Author: Fabrizio Antonangeli <[email protected]>
AuthorDate: Thu Feb 19 05:47:18 2026 +0100
kie-tools#3441: [docker images] docker-squash not saving images when they
are larger (#3442)
Co-authored-by: Thiago Lugli <[email protected]>
---
packages/kn-plugin-workflow/go.mod | 5 ++++-
packages/kn-plugin-workflow/go.sum | 12 ++++++++++--
.../quarkus/testdata/pom1-expected.xml_no_auto_formatting | 5 +++++
packages/kn-plugin-workflow/pkg/metadata/constants.go | 1 +
packages/kogito-base-builder-image/package.json | 2 +-
packages/sonataflow-builder-image/package.json | 2 +-
packages/sonataflow-devmode-image/package.json | 2 +-
.../tests/shell/sonataflow-devmode/src/RunTests.java | 4 ++--
packages/sonataflow-image-common/resources/Makefile | 2 +-
packages/sonataflow-operator/Makefile | 2 +-
packages/sonataflow-operator/container-builder/go.mod | 2 +-
packages/sonataflow-operator/container-builder/go.sum | 3 +--
packages/sonataflow-operator/go.work.sum | 1 +
13 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/packages/kn-plugin-workflow/go.mod
b/packages/kn-plugin-workflow/go.mod
index 34fbb953ec8..5abbe5f424a 100644
--- a/packages/kn-plugin-workflow/go.mod
+++ b/packages/kn-plugin-workflow/go.mod
@@ -11,7 +11,7 @@ require (
github.com/apache/incubator-kie-tools/packages/sonataflow-operator/workflowproj
v0.0.0
github.com/beevik/etree v1.5.0
github.com/distribution/reference v0.6.0
- github.com/docker/docker v28.0.1+incompatible
+ github.com/docker/docker v28.5.2+incompatible
github.com/docker/go-connections v0.5.0
github.com/getkin/kin-openapi v0.131.0
github.com/jstemmer/go-junit-report/v2 v2.1.0
@@ -32,6 +32,8 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
+ github.com/containerd/errdefs v1.0.0 // indirect
+ github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc //
indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
@@ -72,6 +74,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.4.0 // indirect
+ github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd //
indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
diff --git a/packages/kn-plugin-workflow/go.sum
b/packages/kn-plugin-workflow/go.sum
index cf8ee976686..1966d0ac09d 100644
--- a/packages/kn-plugin-workflow/go.sum
+++ b/packages/kn-plugin-workflow/go.sum
@@ -19,6 +19,10 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod
h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
github.com/chzyer/logex v1.1.10/go.mod
h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod
h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod
h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/containerd/errdefs v1.0.0
h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod
h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0
h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod
h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
github.com/containerd/log v0.1.0
h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod
h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod
h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
@@ -34,8 +38,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2
h1:tdlZCpZ/P9DhczC
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod
h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/distribution/reference v0.6.0
h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod
h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.0.1+incompatible
h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
-github.com/docker/docker v28.0.1+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.5.2+incompatible
h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
+github.com/docker/docker v28.5.2+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.5.0
h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
github.com/docker/go-connections v0.5.0/go.mod
h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
github.com/docker/go-units v0.5.0
h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -177,6 +181,10 @@ github.com/moby/docker-image-spec v1.3.1
h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
github.com/moby/docker-image-spec v1.3.1/go.mod
h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/spdystream v0.4.0
h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8=
github.com/moby/spdystream v0.4.0/go.mod
h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
+github.com/moby/sys/atomicwriter v0.1.0
h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod
h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
+github.com/moby/sys/sequential v0.6.0
h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
+github.com/moby/sys/sequential v0.6.0/go.mod
h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
github.com/moby/term v0.5.0/go.mod
h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod
h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
diff --git
a/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
b/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
index d70abb8ab8e..a49c3aacfcd 100644
---
a/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
+++
b/packages/kn-plugin-workflow/pkg/command/quarkus/testdata/pom1-expected.xml_no_auto_formatting
@@ -110,6 +110,11 @@
<artifactId>sonataflow-quarkus-devui</artifactId>
<version>${kie.tooling.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>1.21.4</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/packages/kn-plugin-workflow/pkg/metadata/constants.go
b/packages/kn-plugin-workflow/pkg/metadata/constants.go
index 871bdd087e4..d2291c9cd6d 100644
--- a/packages/kn-plugin-workflow/pkg/metadata/constants.go
+++ b/packages/kn-plugin-workflow/pkg/metadata/constants.go
@@ -46,6 +46,7 @@ var KogitoDependencies = []Dependency{
{GroupId: "org.kie", ArtifactId:
"kogito-addons-quarkus-jobs-service-embedded"},
{GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus"},
{GroupId: "org.apache.kie.sonataflow", ArtifactId:
"sonataflow-quarkus-devui", Version: "${kie.tooling.version}"},
+ {GroupId: "org.testcontainers", ArtifactId: "testcontainers", Version:
"1.21.4"},
}
// requared crds for sonataflow
diff --git a/packages/kogito-base-builder-image/package.json
b/packages/kogito-base-builder-image/package.json
index 374b5dca693..7b08783b3d2 100644
--- a/packages/kogito-base-builder-image/package.json
+++ b/packages/kogito-base-builder-image/package.json
@@ -19,7 +19,7 @@
"copy-assets:linux:darwin": "rimraf build && cp -R
./node_modules/@kie-tools/sonataflow-image-common/dist build && cp -R
resources/* build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
+ "image:build:darwin:linux": "BUILD_ENGINE_OPTIONS='--no-squash' pnpm
setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
"image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"mkdir -p
build/target/test/results\" \"cp -R build/target/test/results
dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm setup:env make -C ./build test-image",
diff --git a/packages/sonataflow-builder-image/package.json
b/packages/sonataflow-builder-image/package.json
index 40d1ea09a05..2d92b72d259 100644
--- a/packages/sonataflow-builder-image/package.json
+++ b/packages/sonataflow-builder-image/package.json
@@ -25,7 +25,7 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/* build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
+ "image:build:darwin:linux": "BUILD_ENGINE_OPTIONS='--no-squash' pnpm
setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
"image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"cp -R
build/target/test/results dist-tests-e2e/\"",
"image:test:linux:darwin": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
diff --git a/packages/sonataflow-devmode-image/package.json
b/packages/sonataflow-devmode-image/package.json
index 42f5cf13c27..6f6260457cb 100644
--- a/packages/sonataflow-devmode-image/package.json
+++ b/packages/sonataflow-devmode-image/package.json
@@ -25,7 +25,7 @@
"copy-test-assets:linux:darwin": "cp -R test-resources/* build",
"format": "prettier --write . --ignore-path=../../.prettierignore
--ignore-path=../../.gitignore",
"image:build": "run-script-os",
- "image:build:darwin:linux": "pnpm setup:env make -C ./build build",
+ "image:build:darwin:linux": "BUILD_ENGINE_OPTIONS='--no-squash' pnpm
setup:env make -C ./build build",
"image:build:win32": "echo \"Build skipped on Windows\"",
"image:test": "run-script-if --ignore-errors \"$(build-env
tests.ignoreFailures)\" --bool \"$(build-env endToEndTests.run)\" --then
\"mkdir -p build/target/test/results\" \"run-script-os\" --finally \"cp -R
build/target/test/results dist-tests-e2e/\"",
"image:test:darwin:linux": "pnpm copy-test-assets && pnpm setup:env make
-C ./build test-image",
diff --git
a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
index 473be499be2..4ed03defd29 100644
---
a/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
+++
b/packages/sonataflow-devmode-image/test-resources/tests/shell/sonataflow-devmode/src/RunTests.java
@@ -28,8 +28,8 @@
//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1
// testcontainers
-//DEPS org.testcontainers:testcontainers:1.19.3
-//DEPS org.testcontainers:junit-jupiter:1.19.3
+//DEPS org.testcontainers:testcontainers:1.21.4
+//DEPS org.testcontainers:testcontainers-junit-jupiter:1.21.4
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/packages/sonataflow-image-common/resources/Makefile
b/packages/sonataflow-image-common/resources/Makefile
index 7cd4147877c..9575310bc98 100644
--- a/packages/sonataflow-image-common/resources/Makefile
+++ b/packages/sonataflow-image-common/resources/Makefile
@@ -21,7 +21,7 @@
CEKIT_BUILD_OPTIONS ?=
CEKIT_CMD := cekit
BUILD_ENGINE ?= docker
-BUILD_ENGINE_OPTIONS ?=
+BUILD_ENGINE_OPTIONS ?= --no-squash
# SWF Image creation envs
KOGITO_IMAGE_NAME ?= # Image name
diff --git a/packages/sonataflow-operator/Makefile
b/packages/sonataflow-operator/Makefile
index c4380a67b3e..2e2b49500df 100644
--- a/packages/sonataflow-operator/Makefile
+++ b/packages/sonataflow-operator/Makefile
@@ -219,7 +219,7 @@ docker-buildx: generate ## Build and push docker image for
the manager for cross
.PHONY: container-build
container-build: ## Build the container image
- cekit -v --descriptor images/manager.yaml build ${build_options}
$(BUILDER) --build-arg SOURCE_DATE_EPOCH="$(shell git log -1 --pretty=%ct)"
+ cekit -v --descriptor images/manager.yaml build ${build_options}
$(BUILDER) --no-squash --build-arg SOURCE_DATE_EPOCH="$(shell git log -1
--pretty=%ct)"
ifneq ($(ignore_tag),true)
$(BUILDER) tag sonataflow-operator:latest ${IMG}
endif
diff --git a/packages/sonataflow-operator/container-builder/go.mod
b/packages/sonataflow-operator/container-builder/go.mod
index 4d9089efd83..beb6d43690c 100644
--- a/packages/sonataflow-operator/container-builder/go.mod
+++ b/packages/sonataflow-operator/container-builder/go.mod
@@ -3,7 +3,7 @@ module
github.com/apache/incubator-kie-tools/packages/sonataflow-operator/contai
go 1.24.0
require (
- github.com/docker/docker v25.0.6+incompatible
+ github.com/docker/docker v28.5.2+incompatible
github.com/docker/go-connections v0.5.0
github.com/google/uuid v1.6.0
github.com/jpillora/backoff v1.0.0
diff --git a/packages/sonataflow-operator/container-builder/go.sum
b/packages/sonataflow-operator/container-builder/go.sum
index 1a06c4cdf20..ed99a16455f 100644
--- a/packages/sonataflow-operator/container-builder/go.sum
+++ b/packages/sonataflow-operator/container-builder/go.sum
@@ -18,8 +18,7 @@ github.com/davecgh/go-spew
v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0
h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod
h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v25.0.6+incompatible
h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg=
-github.com/docker/docker v25.0.6+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.5.2+incompatible
h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
github.com/docker/go-connections v0.5.0
h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
github.com/docker/go-connections v0.5.0/go.mod
h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
github.com/docker/go-units v0.5.0
h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
diff --git a/packages/sonataflow-operator/go.work.sum
b/packages/sonataflow-operator/go.work.sum
index f7e6d49d9c3..abf8d0ea3f5 100644
--- a/packages/sonataflow-operator/go.work.sum
+++ b/packages/sonataflow-operator/go.work.sum
@@ -1896,6 +1896,7 @@ github.com/docker/distribution v2.8.1+incompatible/go.mod
h1:J2gT2udsDAN96Uj4Kfc
github.com/docker/docker v20.10.7+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v20.10.12+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v20.10.20+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.5.2+incompatible/go.mod
h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.6.4/go.mod
h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
github.com/docker/docker-credential-helpers v0.7.0
h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
github.com/docker/docker-credential-helpers v0.7.0/go.mod
h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
