Skip to content

Commit fae7f36

Browse files
fr12kfr12k
authored
Merge pull request #76 from containifyci/dependabot/go_modules/minor-05f989461e
chore(deps): bump github.com/containifyci/engine-ci from 0.35.4 to 0.37.4 in the minor group
2 parents 92bb44d + ef0647f commit fae7f36

7 files changed

Lines changed: 123 additions & 105 deletions

File tree

‎.github/dependabot.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,15 @@ updates:
3838
update-types:
3939
- "minor"
4040
- "patch"
41+
- package-ecosystem: "gomod"
42+
directory: "testdata/hello-world-servlet/.containifyci"
43+
schedule:
44+
interval: "weekly"
45+
day: "sunday"
46+
groups:
47+
minor:
48+
patterns:
49+
- "*"
50+
update-types:
51+
- "minor"
52+
- "patch"

‎go.mod‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/containifyci/engine-java
22

3-
go 1.25.0
3+
go 1.25.5
44

55
// replace github.com/containifyci/engine-ci => ../engine-ci
66

77
require (
8-
github.com/containifyci/engine-ci v0.35.4
8+
github.com/containifyci/engine-ci v0.37.5
99
github.com/spf13/cobra v1.10.2
1010
github.com/stretchr/testify v1.11.1
1111
)
@@ -28,9 +28,9 @@ require (
2828
github.com/containers/buildah v1.42.2 // indirect
2929
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
3030
github.com/containers/ocicrypt v1.2.1 // indirect
31-
github.com/containers/podman/v5 v5.7.0 // indirect
31+
github.com/containers/podman/v5 v5.7.1 // indirect
3232
github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 // indirect
33-
github.com/containifyci/engine-ci/protos2 v0.21.0 // indirect
33+
github.com/containifyci/engine-ci/protos2 v0.23.0 // indirect
3434
github.com/containifyci/go-self-update v0.2.4 // indirect
3535
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
3636
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
@@ -80,7 +80,7 @@ require (
8080
github.com/mattn/go-sqlite3 v1.14.32 // indirect
8181
github.com/miekg/pkcs11 v1.1.1 // indirect
8282
github.com/mistifyio/go-zfs/v3 v3.1.0 // indirect
83-
github.com/moby/buildkit v0.26.2 // indirect
83+
github.com/moby/buildkit v0.26.3 // indirect
8484
github.com/moby/docker-image-spec v1.3.1 // indirect
8585
github.com/moby/sys/capability v0.4.0 // indirect
8686
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -96,7 +96,7 @@ require (
9696
github.com/opencontainers/go-digest v1.0.0 // indirect
9797
github.com/opencontainers/image-spec v1.1.1 // indirect
9898
github.com/opencontainers/runc v1.3.4 // indirect
99-
github.com/opencontainers/runtime-spec v1.2.1 // indirect
99+
github.com/opencontainers/runtime-spec v1.3.0 // indirect
100100
github.com/opencontainers/runtime-tools v0.9.1-0.20250523060157-0ea5ed0382a2 // indirect
101101
github.com/opencontainers/selinux v1.13.1 // indirect
102102
github.com/pkg/errors v0.9.1 // indirect
@@ -129,20 +129,24 @@ require (
129129
go.podman.io/image/v5 v5.38.0 // indirect
130130
go.podman.io/storage v1.61.0 // indirect
131131
go.yaml.in/yaml/v2 v2.4.2 // indirect
132-
golang.org/x/crypto v0.45.0 // indirect
133-
golang.org/x/mod v0.29.0 // indirect
134-
golang.org/x/net v0.47.0 // indirect
135-
golang.org/x/sync v0.18.0 // indirect
136-
golang.org/x/sys v0.38.0 // indirect
137-
golang.org/x/term v0.37.0 // indirect
138-
golang.org/x/text v0.31.0 // indirect
132+
golang.org/x/crypto v0.46.0 // indirect
133+
golang.org/x/mod v0.30.0 // indirect
134+
golang.org/x/net v0.48.0 // indirect
135+
golang.org/x/sync v0.19.0 // indirect
136+
golang.org/x/sys v0.40.0 // indirect
137+
golang.org/x/term v0.39.0 // indirect
138+
golang.org/x/text v0.32.0 // indirect
139139
golang.org/x/time v0.14.0 // indirect
140-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
141-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
142-
google.golang.org/grpc v1.77.0 // indirect
143-
google.golang.org/protobuf v1.36.10 // indirect
140+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
142+
google.golang.org/grpc v1.78.0 // indirect
143+
google.golang.org/protobuf v1.36.11 // indirect
144144
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
145145
gopkg.in/yaml.v3 v3.0.1 // indirect
146146
sigs.k8s.io/yaml v1.6.0 // indirect
147147
tags.cncf.io/container-device-interface v1.0.1 // indirect
148148
)
149+
150+
// Until Error: ../../../go/pkg/mod/github.com/opencontainers/runtime-tools@v0.9.1-0.20250523060157-0ea5ed0382a2/generate/generate.go:973:40: cannot use limit (variable of type int64) as *int64 value in assignment is fixed
151+
// pin version to working version v1.2.1
152+
replace github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.2.1

‎go.sum‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYgle
4949
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
5050
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
5151
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
52-
github.com/containers/podman/v5 v5.7.0 h1:gz1LLHIdsoQZ5ZjgIoOpE+ROark0jHKlXPtKj3S9VE8=
53-
github.com/containers/podman/v5 v5.7.0/go.mod h1:u2YBChWXpDMHbV6ga78deseofCas/8bZilkZfQ2XGCo=
52+
github.com/containers/podman/v5 v5.7.1 h1:rxt3Fl3JS85ZnWZU7jTqR9YOk9fYFqI/2Gy6UMooAhk=
53+
github.com/containers/podman/v5 v5.7.1/go.mod h1:+3SYEQiTjid9pnoFMF8jKWVOymTzIQCFGDsZ28b5nqw=
5454
github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 h1:bYj0TVlkRZtMJYd6SbFOi1gjUJDJmVsYCpJla3URD7Y=
5555
github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86/go.mod h1:52GX23ST30pXpeviDvNpOCXoHqr+WJDv+7BjEH+AabY=
56-
github.com/containifyci/engine-ci v0.35.4 h1:y7jCJPsCMdP1go9HKGmQftNMrhwukFMl3vh/+BiMM44=
57-
github.com/containifyci/engine-ci v0.35.4/go.mod h1:n2lFNZzMdPEfmEvrgFAC84GCJ8XvdUlXX92ZIFo3NHU=
58-
github.com/containifyci/engine-ci/protos2 v0.21.0 h1:RE7rlp2DL1gskDO7L+tjBZNFrcIwlSDI1fx61Zm+khM=
59-
github.com/containifyci/engine-ci/protos2 v0.21.0/go.mod h1:KmRvSjptuzkWoq32b/zm/LtNe0SVJ4rABUwu6g+7UoA=
56+
github.com/containifyci/engine-ci v0.37.5 h1:ae1oXUCNIiyubdNB0CaWLA2nBKaqur1X8oa1U6L8Q/U=
57+
github.com/containifyci/engine-ci v0.37.5/go.mod h1:nRHSeQ4nKsDA58Xn40Ej8vaVa2Ewar6dK0d2BohoGCk=
58+
github.com/containifyci/engine-ci/protos2 v0.23.0 h1:3WL9rds9Huy6aNx18D42mk6cQXDEsTSIcBQSoHIeHlg=
59+
github.com/containifyci/engine-ci/protos2 v0.23.0/go.mod h1:QSOp/vZyQPTNh78xRFHCbcFHlywrEUicKkRp9+oZv1M=
6060
github.com/containifyci/go-self-update v0.2.4 h1:h1JWwVihXPMikn4MBQlYtU8Nc6e1hxRos5/y1KTzE0k=
6161
github.com/containifyci/go-self-update v0.2.4/go.mod h1:MG6yKTeEvk+znIyGt4NBrcvT9wquH18TqKT6W+0zJTE=
6262
github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
@@ -200,8 +200,8 @@ github.com/migueleliasweb/go-github-mock v1.4.0 h1:pQ6K8r348m2q79A8Khb0PbEeNQV7t
200200
github.com/migueleliasweb/go-github-mock v1.4.0/go.mod h1:/DUmhXkxrgVlDOVBqGoUXkV4w0ms5n1jDQHotYm135o=
201201
github.com/mistifyio/go-zfs/v3 v3.1.0 h1:FZaylcg0hjUp27i23VcJJQiuBeAZjrC8lPqCGM1CopY=
202202
github.com/mistifyio/go-zfs/v3 v3.1.0/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
203-
github.com/moby/buildkit v0.26.2 h1:EIh5j0gzRsCZmQzvgNNWzSDbuKqwUIiBH7ssqLv8RU8=
204-
github.com/moby/buildkit v0.26.2/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40=
203+
github.com/moby/buildkit v0.26.3 h1:D+ruZVAk/3ipRq5XRxBH9/DIFpRjSlTtMbghT5gQP9g=
204+
github.com/moby/buildkit v0.26.3/go.mod h1:4T4wJzQS4kYWIfFRjsbJry4QoxDBjK+UGOEOs1izL7w=
205205
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
206206
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
207207
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
@@ -374,17 +374,17 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf
374374
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
375375
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
376376
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
377-
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
378-
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
377+
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
378+
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
379379
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
380380
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
381381
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
382382
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
383383
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
384384
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
385385
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
386-
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
387-
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
386+
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
387+
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
388388
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
389389
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
390390
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -396,8 +396,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
396396
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
397397
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
398398
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
399-
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
400-
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
399+
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
400+
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
401401
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
402402
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
403403
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -408,8 +408,8 @@ golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
408408
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
409409
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
410410
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
411-
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
412-
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
411+
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
412+
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
413413
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
414414
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
415415
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -435,8 +435,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
435435
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
436436
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
437437
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
438-
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
439-
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
438+
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
439+
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
440440
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
441441
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
442442
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -447,8 +447,8 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
447447
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
448448
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
449449
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
450-
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
451-
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
450+
golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
451+
golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
452452
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
453453
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
454454
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -459,8 +459,8 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
459459
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
460460
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
461461
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
462-
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
463-
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
462+
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
463+
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
464464
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
465465
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
466466
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -471,22 +471,22 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
471471
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
472472
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
473473
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
474-
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
475-
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
474+
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
475+
golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
476476
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
477477
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
478478
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
479479
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
480480
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
481481
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
482-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
483-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
484-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 h1:Wgl1rcDNThT+Zn47YyCXOXyX/COgMTIdhJ717F0l4xk=
485-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
486-
google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
487-
google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
488-
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
489-
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
482+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=
483+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
484+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU=
485+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
486+
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
487+
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
488+
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
489+
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
490490
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
491491
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
492492
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎pkg/maven/maven.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ type MavenContainer struct {
4242
*container.Container
4343
}
4444

45-
func New() build.BuildStepv2 {
45+
func New() build.BuildStepv3 {
4646
return build.Stepper{
47-
RunFn: func(build container.Build) error {
47+
RunFnV3: func(build container.Build) (string, error) {
4848
container := new(&build)
4949
return container.Run()
5050
},
5151
MatchedFn: Matches,
5252
ImagesFn: Images,
53-
Name_: "gorelease",
53+
Name_: "maven",
5454
Async_: false,
5555
}
5656
}
@@ -261,13 +261,13 @@ func (c *MavenContainer) BuildScript() string {
261261
return Script(NewBuildScript(c.Verbose, c.Folder, getContainifyHost(c.GetBuild())))
262262
}
263263

264-
func NewProd() build.BuildStepv2 {
264+
func NewProd() build.BuildStepv3 {
265265
return build.Stepper{
266-
RunFn: func(build container.Build) error {
266+
RunFnV3: func(build container.Build) (string, error) {
267267
c := new(&build)
268268
if build.Image == "" {
269269
slog.Info("No image name skip prod image creation")
270-
return nil
270+
return "", nil
271271
}
272272
return c.Prod()
273273
},
@@ -282,7 +282,7 @@ func NewProd() build.BuildStepv2 {
282282
}
283283
}
284284

285-
func (c *MavenContainer) Prod() error {
285+
func (c *MavenContainer) Prod() (string, error) {
286286
opts := types.ContainerConfig{}
287287
opts.Image = c.ProdImage
288288
opts.Platform = types.AutoPlatform
@@ -322,7 +322,7 @@ func (c *MavenContainer) Prod() error {
322322
push := c.GetBuild().Custom.Bool("push", true)
323323
if !push {
324324
slog.Info("Skipping image push", "image", c.Image, "tag", c.ImageTag)
325-
return nil
325+
return "", nil
326326
}
327327
imageUri := utils.ImageURI(c.GetBuild().Registry, c.Image, c.ImageTag)
328328
err = c.Push(imageId, imageUri)
@@ -331,27 +331,27 @@ func (c *MavenContainer) Prod() error {
331331
os.Exit(1)
332332
}
333333

334-
return err
334+
return c.ID, err
335335
}
336336

337-
func (c *MavenContainer) Run() error {
337+
func (c *MavenContainer) Run() (string, error) {
338338
err := c.Pull()
339339
if err != nil {
340340
slog.Error("Failed to pull base images: %s", "error", err)
341-
return err
341+
return "", err
342342
}
343343

344344
err = c.BuildMavenImage()
345345
if err != nil {
346346
slog.Error("Failed to build go image: %s", "error", err)
347-
return err
347+
return "", err
348348
}
349349

350350
err = c.Build()
351351
slog.Info("Container created", "containerId", c.ID)
352352
if err != nil {
353353
slog.Error("Failed to create container: %s", "error", err)
354-
return err
354+
return "", err
355355
}
356-
return nil
356+
return c.ID, nil
357357
}

0 commit comments

Comments
 (0)