fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,432 Commits 22 Branches 339 Tags
Commit Graph

446 Commits

Author SHA1 Message Date
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 4f672b9588019093a99d27d507a682403d1a1138.

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
Phillip Webb
0afbc0b23c Polish 'Accept Docker progress on numbers >2GB' 
Restore `int` returns for existing methods and deprecate them in
favor of a new `asPercentage()` method.

See gh-43328
 2024-12-02 13:58:03 -08:00
Wolfgang Kronberg
d8565185e8 Accept Docker progress on numbers >2GB 
Update `ProgressUpdateEvent` to support images of a file size
>2GB without provoking build failures.

See gh-43328
 2024-12-02 13:56:09 -08:00
Andy Wilkinson
32433e84f3 Merge branch '3.3.x' 
Closes gh-43270
 2024-11-22 15:46:38 +00:00
Andy Wilkinson
bb3651b7d1 Reduce warnings reported by Eclipse 
Closes gh-43269
 2024-11-22 15:39:35 +00:00
Phillip Webb
f77c3bbd6b Merge branch '3.3.x' 
Closes gh-43171
 2024-11-14 15:50:15 -08:00
Phillip Webb
66ec6b32e3 Merge branch '3.2.x' into 3.3.x 
Closes gh-43170
 2024-11-14 15:50:04 -08:00
Phillip Webb
25b6477aa8 Support alternative media type format 
Update `ExportedImageTar` media type detection to support `tar+gzip`
as well as `tar.gzip`. Recent updates to Docker Desktop appear to have
changed the format.

Fixes gh-43126
 2024-11-14 15:25:15 -08:00
Phillip Webb
a293560237 Support nested OCI indexes 
Update `ExportedImageTar.IndexLayerArchiveFactory` to support nested
indexes. Nested indexes support a layer of interaction where the
`index.json` file points to a blob that contains the read index to use.

Prior to this commit, we only supported indexes provided directly by
the `index.json` file. This missing support results in "buildpack.toml:
no such file or directory" errors when referencing specific buildpacks
and using Docker Engine 27.3.1 or above.

See gh-43126
 2024-11-14 15:24:47 -08:00
Andy Wilkinson
c6e19517be Merge branch '3.3.x' 
Closes gh-43070
 2024-11-08 09:55:36 +00:00
Andy Wilkinson
81872afd53 Merge branch '3.2.x' into 3.3.x 
Closes gh-43069
 2024-11-08 09:55:22 +00:00
Andy Wilkinson
2fa28fb822 Improve error reporting when image loading fails 
Closes gh-31243
 2024-11-08 09:51:57 +00:00
Phillip Webb
dbb5e05ebf Merge branch '3.3.x' 
Closes gh-42992
 2024-11-04 16:19:04 -08:00
Phillip Webb
189e49f6d6 Merge branch '3.2.x' into 3.3.x 
Closes gh-42991
 2024-11-04 15:56:29 -08:00
Phillip Webb
c62a018830 Align buildpack certificate and key parsers with SSL versions 
Closes gh-37969
 2024-11-04 15:53:39 -08:00
Phillip Webb
269f18c0ca Merge branch '3.3.x' 
Closes gh-42990
 2024-11-04 14:34:39 -08:00
Phillip Webb
4a7c757945 Merge branch '3.2.x' into 3.3.x 
Closes gh-42989
 2024-11-04 14:34:17 -08:00
Phillip Webb
202db9b7f4 Update copyright year of changed files 2024-11-04 14:28:23 -08:00
Andy Wilkinson
a3168e3a2f Centralize dependency management of Commons Compress 
Closes gh-39368
 2024-11-04 11:45:41 +00:00
Phillip Webb
2fa1180332 Make NamedPipeSocket.connect a no-op to fix connection exceptions 
Update `NamedPipeSocket` so that `connect` methods are now no-ops. This
restores the behavior of Spring Boot 3.3 which previously handled the
case by overriding `ConnectionSocketFactory.connectSocket`. The newer
HTTP client code uses the `DetachedSocketFactory` interface which
doesn't offer a method that we can override, so instead we must change
the socket implementation itself.

Fixes gh-42952
 2024-11-01 13:22:07 -07:00
Phillip Webb
bc5a25bf16 Polish 2024-11-01 13:14:05 -07:00
Moritz Halbritter
8f6aabc15b Merge branch '3.3.x' 
Closes gh-42960
 2024-10-31 15:07:11 +01:00
Moritz Halbritter
6470748d6d Merge branch '3.2.x' into 3.3.x 
Closes gh-42959
 2024-10-31 15:07:02 +01:00
Moritz Halbritter
90b920a410 Use default address if null address is given 
Closes gh-42958
 2024-10-31 14:34:30 +01:00
Stéphane Nicoll
cc443366fa Merge branch '3.3.x' 
Closes gh-42915
 2024-10-29 13:28:42 +09:00
Stéphane Nicoll
4401673d6d Merge branch '3.2.x' into 3.3.x 
Closes gh-42914
 2024-10-29 13:27:06 +09:00
Stéphane Nicoll
d4010d3be0 Polish "Prevent auth header to be included in Docker API call" 
See gh-42910
 2024-10-29 13:24:09 +09:00
YiXuan Ding
351018ea65 Prevent auth header to be included in Docker API call 
See gh-42910
 2024-10-29 13:16:08 +09:00
Moritz Halbritter
c018c43886 Merge branch '3.3.x' 
Closes gh-42736
 2024-10-17 13:44:25 +02:00
Moritz Halbritter
8efe6e02d9 Merge branch '3.2.x' into 3.3.x 
Closes gh-42735
 2024-10-17 13:38:03 +02:00
Moritz Halbritter
a3060652f8 Call String.toLowerCase and .toUppercase with explicit locale 
Closes gh-42719
 2024-10-17 13:20:39 +02:00
Moritz Halbritter
d1976a48dc Upgrade to HttpClient5 5.4 
Closes gh-42675
 2024-10-17 09:51:39 +02:00
Phillip Webb
0a6d3f312e Polish 2024-10-16 13:08:21 -07:00
Moritz Halbritter
957e2f8b7f Add warning if sensitive container paths are bound 
Closes gh-41643
 2024-10-14 10:18:34 +02:00
Anthony Dahanne
416413957a Use builder-jammy-java-tiny when using Buildpacks 
See gh-42508
 2024-10-07 13:30:41 +02:00
Phillip Webb
7b3077280c Merge branch '3.3.x' 
Closes gh-42441
 2024-09-24 14:32:48 -07:00
Phillip Webb
100bedc07d Merge branch '3.2.x' into 3.3.x 
Closes gh-42440
 2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b Apply conventions plugin to all subprojects 
Closes gh-42438
 2024-09-24 14:26:32 -07:00
Phillip Webb
7fc5c4bb6c Merge branch '3.3.x' 
Closes gh-42082
 2024-09-01 18:51:45 -07:00