Moritz Halbritter
d0a93dd7cd
Merge branch '3.4.x'
2025-03-11 14:01:11 +01:00
Moritz Halbritter
e7f8b22479
Enable platform mismatch test again
...
We now try to pull linux/arm64. The image only exists for linux/amd64, which should
throw the platform mismatch exception.
See gh-44059
2025-03-11 13:32:15 +01:00
Moritz Halbritter
58fab66163
Merge branch '3.4.x'
2025-03-10 16:15:48 +01:00
Moritz Halbritter
8fca1dbb6f
Disable test until further investigation
...
See gh-44059
2025-03-10 16:12:33 +01:00
Moritz Halbritter
1aa1bab0a8
Merge branch '3.4.x'
2025-03-10 11:28:03 +01:00
Moritz Halbritter
24854f469c
Use single-arch image to test platform mismatch detection
...
See gh-44059
2025-03-10 11:00:55 +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
Andy Wilkinson
162be9670d
Merge branch '3.4.x'
2025-03-05 15:43:14 +00:00
Andy Wilkinson
1eef4385ec
Merge branch '3.3.x' into 3.4.x
2025-03-05 15:43:00 +00:00
Andy Wilkinson
1f5b9de302
Normalize the separator in resource names
...
See gh-44444
2025-03-05 15:42:41 +00:00
Andy Wilkinson
b89cca355e
Merge branch '3.4.x'
2025-03-05 14:34:29 +00:00
Andy Wilkinson
bfd4e7b4ee
Merge branch '3.3.x' into 3.4.x
2025-03-05 14:34:11 +00:00
Andy Wilkinson
5683d39fd6
Allow resources to hide existing resources with the same name
...
See gh-44444
2025-03-05 14:33:57 +00:00
Moritz Halbritter
0852243fc6
Merge branch '3.4.x'
...
Closes gh-44537
2025-03-05 11:56:32 +01:00
Moritz Halbritter
d453a59724
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44536
2025-03-05 11:56:21 +01:00
Tran Ngoc Nhan
701f73fcd7
Fix JavaExec javadoc link
...
See gh-44526
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-03-05 11:55:29 +01:00
Eddú Meléndez
5fac1011d6
Add ServiceConnection support for lldap/lldap (Compose)
...
See gh-44389
Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Moritz Halbritter
98e60b5607
Merge branch '3.4.x'
...
Closes gh-44479
2025-02-28 10:36:57 +01:00
Moritz Halbritter
d2d8978170
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44478
2025-02-28 10:36:39 +01:00
Dmitry Sulman
7276be825a
Update version of Neo4j test container image
...
See gh-44463
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:35:55 +01:00
Moritz Halbritter
b9bf4a557e
Merge branch '3.4.x'
...
Closes gh-44476
2025-02-28 10:32:48 +01:00
Moritz Halbritter
da361efd3f
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44475
2025-02-28 10:32:20 +01:00
Dmitry Sulman
c98f9ac126
Update version of Elasticsearch test container image
...
See gh-44459
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:31:07 +01:00
Andy Wilkinson
a5ff2a94f0
Merge branch '3.4.x'
...
Closes gh-44446
2025-02-26 15:31:17 +00:00
Andy Wilkinson
23b89c8cb3
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44445
2025-02-26 15:31:04 +00:00
Andy Wilkinson
3acea583ad
Add support for working with resources in tests
...
Closes gh-44444
2025-02-26 15:29:20 +00: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
Stéphane Nicoll
48e3de0cd1
Merge branch '3.4.x'
...
Closes gh-44410
2025-02-22 19:05:14 +01:00
Stéphane Nicoll
de32c6ff79
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44409
2025-02-22 19:05:07 +01:00
Tran Ngoc Nhan
d781ce164d
Use Javadoc attributes for Gradle reference guide
...
See gh-44388
Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-22 19:02:33 +01:00
Phillip Webb
360927186e
Merge branch '3.4.x'
...
Closes gh-44365
2025-02-19 12:21:13 -08:00
Phillip Webb
792c13eaf0
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44364
2025-02-19 12:21:04 -08:00
Dmytro Nosan
e919fd806f
Polish ClassPath
...
See gh-44355
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-19 12:20:10 -08: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
8c132711e4
Merge branch '3.4.x'
2025-02-18 17:44:28 -08:00
Phillip Webb
8c6e856340
Fix formatting
2025-02-18 17:44:24 -08:00
Phillip Webb
6076e9e2c1
Merge branch '3.4.x'
2025-02-18 17:29:38 -08:00
Phillip Webb
661fcfe033
Merge branch '3.3.x' into 3.4.x
2025-02-18 17:29:31 -08:00
Phillip Webb
082c5859e8
Polish
2025-02-18 17:22:53 -08:00
Phillip Webb
651a39b3f6
Merge branch '3.4.x'
2025-02-18 15:12:07 -08:00
Phillip Webb
eeced8c629
Merge branch '3.3.x' into 3.4.x
2025-02-18 15:11:51 -08:00