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

404 Commits

Author SHA1 Message Date
Phillip Webb
abdff95ad0 Merge branch '3.2.x' 
Closes gh-40526
 2024-04-25 12:54:13 -07:00
Phillip Webb
9e40970280 Support gzip compressed image layers 
Update buildpack support to allow gzip compressed image layers to be
used when returned by the Docker engine. This update is restores
buildpack support when using Docker Desktop with the "Use containerd
for pulling and storing images" option enabled.

This commit introduces a new `ExportedImageTar` class to deal with the
intricacies of determining the mimetype of a layer. The class deals with
the parsing of `index.json' and related manifest blobs in order to
obtain layer information. The legacy `manifest.json` format is also
supported should `index.json` be missing.

Tests have been added to ensure that export archives from Docker Engine,
Docker Desktop (with and without containerd), and Podman can be used.

Fixes gh-40100

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
Co-authored-by: Scott Frederick <scott.frederick@broadcom.com>
 2024-04-25 11:51:59 -07:00
Moritz Halbritter
3ab21ce146 Merge branch '3.2.x' 
Closes gh-40118
 2024-03-27 09:42:59 +01:00
Moritz Halbritter
957facf1cc Merge branch '3.1.x' into 3.2.x 
Closes gh-40117
 2024-03-27 09:35:44 +01:00
Moritz Halbritter
ff66036e90 Remove redundant Regex escapes 
Closes gh-40116
 2024-03-27 09:34:28 +01:00
Andy Wilkinson
70769d9377 Merge branch '3.2.x' 
Closes gh-39794
 2024-02-28 17:20:00 +00:00
Andy Wilkinson
306d52db77 Merge branch '3.1.x' into 3.2.x 
Closes gh-39793
 2024-02-28 17:19:46 +00:00
Andy Wilkinson
16b6400bdf Improve BuildpackReference's handling of URL-like strings on Windows 
Closes gh-39792
 2024-02-28 17:15:02 +00:00
Phillip Webb
f8a1dae835 Merge branch '3.2.x' 2024-02-21 15:27:57 -08:00
Phillip Webb
12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Scott Frederick
bb384f268e Merge branch '3.2.x' 
Closes gh-39639
 2024-02-20 10:34:54 -06:00
Scott Frederick
71e5e1252a Merge branch '3.1.x' into 3.2.x 
Closes gh-39638
 2024-02-20 10:34:32 -06:00
Scott Frederick
c93acdafbd Polish "Prevent long parse times for images with illegal char in tag" 
See gh-39617
 2024-02-20 10:27:28 -06:00
Jakob Wanger
c892544741 Prevent long parse times for images with illegal char in tag 
Update the regular expression used to parse Docker images references to
prevent catastrophic backtracking when images names are long and the
tag contains an illegal character.

See gh-39617
 2024-02-20 10:27:27 -06:00
Moritz Halbritter
7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01:00
Moritz Halbritter
4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Andy Wilkinson
5ae533a00d Minimize scope of version management for commons-compress 
See gh-39368
 2024-02-06 15:08:15 +00:00
Andy Wilkinson
9a5b3b3a2b Merge branch '3.2.x' 
See gh-39369
 2024-02-06 12:38:37 +00:00
Andy Wilkinson
84e390af70 Merge branch '3.1.x' into 3.2.x 
See gh-39368
 2024-02-06 12:37:18 +00:00
Andy Wilkinson
5f680ccac0 Revert "Stop managing version of commons-compress where it isn't needed" 
This reverts commit 2b85cb03566b88d616fa51d970be6425c4d454d1.

See gh-39367
 2024-02-06 12:36:26 +00:00
Andy Wilkinson
f9363569ab Merge branch '3.2.x' 
Closes gh-39369
 2024-02-01 11:19:01 +00:00
Andy Wilkinson
0afe0635b9 Merge branch '3.1.x' into 3.2.x 
Closes gh-39368
 2024-02-01 11:17:41 +00:00
Andy Wilkinson
2b85cb0356 Stop managing version of commons-compress where it isn't needed 
Closes gh-39367
 2024-02-01 10:20:20 +00:00
Andy Wilkinson
899da7891a Merge branch '3.1.x' into 3.2.x 
See gh-39340
 2024-01-31 17:44:07 +00:00
Andy Wilkinson
dd082c6c21 Revert "Upgrade to Commons Compress 1.25.0" 
This reverts commit 1c2a622f7fcef9ebd5cb74ade3869a3dfc3ca6af.

See gh-39148
 2024-01-31 17:35:57 +00:00
Scott Frederick
588d544392 Merge branch '3.2.x' 
Closes gh-39348
 2024-01-30 16:28:50 -06:00
Scott Frederick
5b76416b06 Merge branch '3.1.x' into 3.2.x 
Closes gh-39347
 2024-01-30 16:28:39 -06:00
Scott Frederick
a620d348ad Fix exporting of Docker image layers 
The logic to extract layers from a downloaded Docker image assumed that
the layer entries in the image tar archive always had the file extension
`.tar`. This was the case with Docker and other compatible daemons until
Docker 25.0. With this commit, the extension is no longer assumed, but
any entries listed in `manifest.json` will be recognized.

Fixes gh-39323
 2024-01-30 16:25:03 -06:00
Andy Wilkinson
10e750ab3b Merge branch '3.2.x' 
Closes gh-39341
 2024-01-30 13:53:13 +00:00
Andy Wilkinson
8c18d75b12 Merge branch '3.1.x' into 3.2.x 
Closes gh-39340
 2024-01-30 13:50:13 +00:00
Andy Wilkinson
1c2a622f7f Upgrade to Commons Compress 1.25.0 
Closes gh-39148
 2024-01-30 13:49:37 +00:00
Phillip Webb
8f1a330dd5 Update copyright header of cleaned up code 
See gh-39259
 2024-01-23 10:18:50 -08:00
Tobias Lippert
d3c97adf79 Remove redundant array creation 
See gh-39259
 2024-01-23 10:18:49 -08:00
Andy Wilkinson
7087897507 Merge branch '3.1.x' into 3.2.x 
Closes gh-39091
 2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5 Fix Checkstyle upgrade 
Closes gh-38746
 2024-01-10 15:37:38 +00:00
Scott Frederick
d433deb737 Merge branch '3.0.x' into 3.1.x 
Closes gh-38485
 2023-11-21 17:30:54 -06:00
Scott Frederick
dabcebf8a3 Merge branch '2.7.x' into 3.0.x 
Closes gh-38484
 2023-11-21 17:30:07 -06:00
Scott Frederick
d1cce0f8ef Upgrade default CNB builders to Paketo Jammy 
Closes gh-38477
 2023-11-21 17:22:32 -06:00
Moritz Halbritter
20edbb402f Merge branch '3.1.x' 2023-10-31 10:23:13 +01:00
Moritz Halbritter
607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter
f3c10ae97b Polish JsonStream 2023-10-31 09:49:01 +01:00
Scott Frederick
f947bad3f7 Merge branch '3.1.x' 
Closes gh-37666
 2023-10-03 13:18:32 -05:00
Ivo Smid
f2a4336ea1 Increase the socket timeout for remote connections to Docker daemon 
The default socket timeout with HttpClient 5 is not long enough
in some cases where Docker images are built that require the
GraalVM native image compiler to run in a buildpack. This commit
increases the timeout to 30 minutes.

Fixes gh-37665

Co-authored-by: Scott Frederick <sfrederick@vmware.com>"
 2023-10-03 11:52:48 -05:00
Phillip Webb
052757c2d8 Polish 2023-09-27 20:58:09 -07:00
Scott Frederick
9811cc030f Fix LifecycleTests for security options on Windows 
Fixes gh-37598
 2023-09-27 10:09:44 -05:00
Phillip Webb
2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07:00
Phillip Webb
78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb
9b5062e5bb Merge branch '2.7.x' into 3.0.x 2023-09-20 17:06:55 -07:00
Phillip Webb
e10ac76761 Polish 2023-09-20 16:05:30 -07:00