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

163 Commits

Author SHA1 Message Date
Andy Wilkinson
d6b04af512 Merge branch '2.7.x' into 3.0.x 
Closes gh-37182
 2023-09-04 08:25:33 +01:00
Andy Wilkinson
fadc58679d Speed up ImageReference.of when path contains upper-case chars 
Closes gh-35657
 2023-09-04 08:18:28 +01:00
Phillip Webb
71ed31343c Merge branch '2.7.x' into 3.0.x 
Closes gh-37168
 2023-08-31 22:01:06 -07:00
Phillip Webb
fd8cb74b46 Load algorithm parameters from PEM encoded 'EC PRIVATE KEY' files 
Update `PrivateKeyParser` implementations so that algorithm parameters
for PEM encoded 'EC PRIVATE KEY' files are loaded from the incoming
data.

Prior to this commit, the algorithm parameter was hard-coded to
'secp384r1' which could result in a mismatch to the actual file
content.

Fixes gh-34232
 2023-08-31 21:40:11 -07:00
Phillip Webb
a0089c5c76 Merge branch '2.7.x' into 3.0.x 2023-08-13 18:44:36 -07:00
Phillip Webb
46773dd5df Update copyright year of changed files 2023-08-13 18:19:05 -07:00
Scott Frederick
eeeb2ad72a Merge branch '2.7.x' into 3.0.x 
Closes gh-36049
 2023-06-23 15:19:44 -06:00
Johnny Lim
4a2c9d99dc Remove redundant Files.delete() calls in tests 
See gh-35986
 2023-06-23 15:14:59 -06:00
Phillip Webb
92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Phillip Webb
57e45dfb21 Update copyright year of changed files 2023-05-12 13:01:43 -07:00
Phillip Webb
ef4b09718c Fix loading of PKCS#8 PEM encoded EC and DSA keys for buildpack 
Polish and port support for PKCS#8 PEM encoded EC and DSA keys to
the buildpack code.

See gh-35322
 2023-05-12 13:01:30 -07:00
Moritz Halbritter
d00e070cdb Separate tag in the Docker API tag call 
Closes gh-35358
 2023-05-11 09:52:45 +02:00
Moritz Halbritter
4eef8d5a53 Separate tag in the Docker API tag call 
Closes gh-35358
 2023-05-11 09:52:41 +02:00
Scott Frederick
29ad690d56 Merge branch '2.7.x' into 3.0.x 
Closes gh-34495
 2023-03-06 15:30:55 -06:00
Scott Frederick
7730eee439 Use image manifest when exporting layers 
A tar archive of a Docker image contains a `mainfest.json` file that
lists the path to each embedded tar file containing the contents of a
layer in the image. This manifest file should be used to identify the
layer files instead of relying on file naming conventions and
assumptions on the directory structure that are not consistent
between container engine implementations.

Fixes gh-34324
 2023-03-06 15:13:08 -06:00
Phillip Webb
0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb
c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb
df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
Johnny Lim
bc7fc90550 Replace Base64Utils with JDK's Base64 
See gh-33967
 2023-01-31 10:20:06 +01:00
Krzysztof Krason
a9c547e767 Use text blocks 
See gh-33987
 2023-01-26 20:36:01 -08:00
Phillip Webb
a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Krzysztof Krason
cf6493f65c Simplify AssertJ assertions and also make them more readable 
See gh-33653
 2023-01-09 11:10:20 +01:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Moritz Halbritter
f36e2ecb7b Use AutoClosables with try-with-resources 
Closes gh-33538
 2022-12-16 15:43:15 +01:00
Moritz Halbritter
725337f976 Make fields final 
Closes gh-33537
 2022-12-16 14:28:44 +01:00
Phillip Webb
7e8ed075c0 Merge branch '2.7.x' 
Closes gh-32682
 2022-10-11 23:21:52 -07:00
Phillip Webb
ed01a77a99 Merge branch '2.6.x' into 2.7.x 
Closes gh-32681
 2022-10-11 23:19:34 -07:00
Phillip Webb
e0c79ce598 Support PEM formatted elliptic-curve TLS keys 
Update `PrivateKeyParser` to support loading PEM formatted
elliptic-curve keys. We need to do a similar trick to the PKCS1 keys
and convert them to a `PKCS8EncodedKeySpec`.

Fixes gh-32646
 2022-10-11 23:18:44 -07:00
dreis2211
65ef8fc51a Use ByteArrayOutputStream.toString where possible 
See gh-32534
 2022-09-29 15:03:24 +02:00
Phillip Webb
e88a682220 Merge branch '2.6.x' into 2.7.x 2022-09-08 19:37:52 -07:00
Scott Frederick
257e236b06 Fix image-building unit tests on Windows 
See gh-32000
 2022-08-24 13:14:39 -05:00
Scott Frederick
c16094e04b Disable SELinux label security policy when building images 
When using the Gradle `bootBuildImage` task or Maven
`spring-boot:build-image` goal on a Linux distribution with SELinux
enabled, binding the Docker socket in the builder container might
fail. This commit disables the `label` security policy in the builder
container to prevent this type of failure.

Fixes gh-32000
 2022-08-19 13:56:34 -05:00
Scott Frederick
e24c49a09a Merge branch '2.6.x' into 2.7.x 
Closes gh-31558
 2022-06-30 14:58:28 -05:00
Scott Frederick
17bdc526f6 Avoid adding layers for buildpacks that exist in the builder 
This commit adds validation of any buildpacks that are specified for
image building to match them against buildpacks that are bundled in
the builder. If an image buildpack's ID, version, and one layer
hash match the same information stored in a label on the builder
image, that buildpack won't be added and the buildpack bundled in
the builder will be used instead. This reduces the chance of adding to
the total count of layers in a builder image unnecessarily.

Fixes gh-31233
 2022-06-30 14:35:34 -05:00
Andy Wilkinson
455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson
4cd850cfc0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30851
 2022-05-03 15:17:13 +01:00
Andy Wilkinson
fa327a783d Merge branch '2.5.x' into 2.6.x 
Closes gh-30850
 2022-05-03 15:14:00 +01:00
Andy Wilkinson
4fd2e0c916 Polish "Fix typos" 
See gh-30773
 2022-05-03 14:09:53 +01:00
Andy Wilkinson
f6d24dc1a8 Fix typos 
See gh-30773
 2022-05-03 14:09:37 +01:00
Phillip Webb
dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Scott Frederick
f032690d0a Add support for CNB platform API 0.9 
Fixes gh-30566
 2022-04-13 16:09:32 -05:00
Scott Frederick
de321b00b7 Support podman for building images 
Closes gh-30196
 2022-03-11 16:39:07 -06:00
Scott Frederick
7ad538cd84 Add option to use configured Docker host in builder 
This commit adds support for a `docker.bindHostToBuilder` option in
the Maven and Gradle image building goal and task.

Fixes gh-29384
 2022-03-11 15:27:22 -06:00
Phillip Webb
26512f8ac6 Merge branch '2.6.x' into 2.7.x 2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645 Merge branch '2.5.x' into 2.6.x 2022-02-16 18:56:12 -08:00
Phillip Webb
9ab1b669d0 Polish 2022-02-16 17:56:07 -08:00
Moritz Halbritter
94d095ce1a Merge branch '2.6.x' into 2.7.x 
Closes gh-29692
 2022-02-09 14:10:41 +01:00
Moritz Halbritter
079ea41d6d Merge branch '2.5.x' into 2.6.x 
Closes gh-29691
 2022-02-09 14:09:33 +01:00
Moritz Halbritter
262db65a38 Ignore invalid stream types when reading log update events 
See gh-29675
 2022-02-09 14:03:02 +01:00