Commit Graph

449 Commits

Author SHA1 Message Date
Moritz Halbritter
0fb369e8b8 Use paketobuildpacks/builder-noble-java-tiny as the default image builder
Closes gh-42711
2025-04-24 15:21:22 +02:00
Phillip Webb
89a89a11a7 Merge branch '3.4.x'
Closes gh-45257
2025-04-22 19:13:29 -07:00
Phillip Webb
f526666e4e Merge branch '3.3.x' into 3.4.x
Closes gh-45256
2025-04-22 19:12:57 -07:00
Phillip Webb
f6dae1397d Add application directory layer to ephemeral builder for Podman support
Update `EphemeralBuilder` so that it adds an additional layer that
containing an empty application (aka workspace) directory owned by
the build user.

Prior to this commit, the directory was only bound. This could cause
issues on Podman where, unlike Docker, the bound directory is owned
by `root`.

Fixes gh-45233
2025-04-22 19:11:45 -07:00
Phillip Webb
a8c9abd5f9 Merge branch '3.4.x' 2025-04-11 10:19:25 -07:00
Phillip Webb
a506d2bdb5 Fix merge commit error in header 2025-04-11 10:19:03 -07:00
Phillip Webb
75824bb9c7 Merge branch '3.4.x' 2025-04-11 09:42:20 -07:00
Phillip Webb
35dc8e6f88 Merge branch '3.3.x' into 3.4.x 2025-04-11 09:42:13 -07:00
Phillip Webb
2143d702f2 Polish boolean members that can use the default false value 2025-04-11 09:32:35 -07:00
Phillip Webb
0d4b1dc9a4 Merge branch '3.4.x'
Closes gh-45167
2025-04-11 09:19:47 -07:00
Phillip Webb
ef9ad41b0a Merge branch '3.3.x' into 3.4.x
Closes gh-45166
2025-04-11 09:19:32 -07:00
Yanming Zhou
0a1c9060c5 Polish ternary operator
See gh-45156

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-04-11 09:19:01 -07:00
Phillip Webb
068f621967 Merge branch '3.4.x' 2025-04-10 16:30:09 -07:00
Phillip Webb
96899e08d4 Merge branch '3.3.x' into 3.4.x 2025-04-10 16:30:04 -07:00
Phillip Webb
935d759754 Fix 'Protect against empty OS string in Docker Image' logic
See gh-45152
2025-04-10 16:29:59 -07:00
Phillip Webb
14f46f374a Merge branch '3.4.x'
Closes gh-45154
2025-04-10 16:09:07 -07:00
Phillip Webb
5a3fc4a48b Merge branch '3.3.x' into 3.4.x
Closes gh-45153
2025-04-10 16:08:56 -07:00
Phillip Webb
c071f56653 Protect against empty OS string in Docker Image
Update `Image` to protect against `os` being `null` or and empty
String.

Fixes gh-45152
2025-04-10 15:47:55 -07:00
Moritz Halbritter
5c32890f43 Merge branch '3.4.x'
Closes gh-45035
2025-04-08 15:28:23 +02:00
Moritz Halbritter
97ed923e50 Explicitly set Host header when using LocalHttpClientTransport
Closes gh-45028
2025-04-08 14:29:16 +02:00
Phillip Webb
39ef5ae2d5 Merge branch '3.4.x' 2025-04-03 18:06:48 -07:00
Phillip Webb
fc9937d05a Merge branch '3.3.x' into 3.4.x 2025-04-03 18:06:33 -07:00
Phillip Webb
88e8c17369 Update copyright year of changed files 2025-04-03 18:06:14 -07:00
Moritz Halbritter
6d2fb65340 Merge branch '3.4.x'
Closes gh-44728
2025-03-17 08:55:25 +01:00
Moritz Halbritter
01719c41fa Merge branch '3.3.x' into 3.4.x
Closes gh-44727
2025-03-17 08:55:16 +01:00
youngjin_dev
a164dab25d Fix Integer conversion in getProgress() method
See gh-44718

Signed-off-by: youngjin_dev <qazkyj0310@gmail.com>
2025-03-17 08:52:15 +01:00
Phillip Webb
a55a6be4ed Merge branch '3.4.x' 2025-03-14 15:15:33 -07:00
Phillip Webb
6eb7d3411b Merge branch '3.3.x' into 3.4.x 2025-03-14 15:14:30 -07:00
Phillip Webb
896b5767fe Polish 2025-03-14 13:36:04 -07:00
Stéphane Nicoll
3ea9c56ea0 Merge branch '3.4.x'
Closes gh-44685
2025-03-12 08:59:27 +01:00
Moritz Halbritter
12c9bfff2f Merge branch '3.4.x'
Closes gh-44640
2025-03-07 11:03:41 +01:00
Moritz Halbritter
d93f4f5554 Throw exception if pulled image platform doesn't match the requested platform
Closes gh-44059
2025-03-07 09:28:17 +01:00
Moritz Halbritter
6f464e71da Merge branch '3.4.x' 2025-03-07 08:21:32 +01:00
Moritz Halbritter
282571ae1e Merge branch '3.3.x' into 3.4.x 2025-03-07 08:21:13 +01:00
Moritz Halbritter
5ec099756f Fix potential NPE when passing 'null' as params 2025-03-07 08:17:37 +01:00
Moritz Halbritter
dde9bfbeaa Merge branch '3.4.x'
Closes gh-44631
2025-03-06 17:41:08 +01:00
Moritz Halbritter
2e74ce8bf2 Merge branch '3.3.x' into 3.4.x
Closes gh-44630
2025-03-06 17:39:26 +01:00
Moritz Halbritter
a807a07a59 Always try to deserialize message in case of Docker transport errors
Before this commit, if the status code was 4xx or 500, we tried to read the errors
object, consuming the http entity. When we tried to deserialize the message,
the http entity was already consumed, an IOException has been thrown and null
is returned for the message.

Now, we read the content in a byte[] and deserialize the errors and the message
from that. This ensures that we can read both the errors and the message.

Closes gh-44628
2025-03-06 17:27:00 +01:00
Moritz Halbritter
3be5e6cc3e Polish "Improve logging in DockerApi"
See gh-44412
2025-02-25 13:14:38 +01:00
Dmytro Nosan
9a940702bc Improve logging in DockerApi
This commit introduces a new constructor in `DockerApi`
that accepts `DockerLogger` as a parameter.

The `DockerLogger` is a pretty simple callback interface used to
provide DockerApi output logging.

See gh-44412

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 13:07:23 +01:00
Moritz Halbritter
ae16856bda Revert "Use noble buildpacks instead of jammy"
This reverts commit 4f672b9588.

See gh-42711
2025-02-19 16:00:27 +01:00
Moritz Halbritter
4f672b9588 Use noble buildpacks instead of jammy
Closes gh-42711
2025-02-19 13:59:21 +01:00
Phillip Webb
651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -08:00
Johnny Lim
c9320de559 Use consistent exception messages in Assert calls
See gh-44044

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-03 13:58:59 +01:00
Andy Wilkinson
1e43b0003f Merge branch '3.4.x'
Closes gh-43951
2025-01-24 08:54:50 +00:00
Andy Wilkinson
2f29a49a1d Remove APIs deprecated for removal in 3.5
Closes gh-43788
2025-01-14 13:59:24 +00:00
Phillip Webb
a49719d73e Use consistent exception messages in Assert calls
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".

Closes gh-43780
2025-01-11 21:18:47 -08:00
Phillip Webb
f08188d5cf Change relevant Assert calls to throw IllegalStateException
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.

Fixes gh-43779
2025-01-11 21:16:36 -08:00
Phillip Webb
123502b8d7 Restore use of fixed version when calling docker APIs
Update `DockerApi` so that calls are made using a fixed version. For
most calls this will be `v1.24`, however, for calls with a platform
we must use the `v1.41`.

When possible, we check that the Docker version in use meets the
required minimum, however, if we can't detect the running version
we now proceed and let the actual API call fail. This is due to the
fact that the `/_ping` endpoint may not always be available. For
example, it is restricted when building from a BitBucket CI pipeline.

Fixes gh-43452
2024-12-10 13:14:20 -08:00
Phillip Webb
dd64b0648f Merge branch '3.3.x'
Closes gh-43356
2024-12-02 13:59:53 -08:00