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
Scott Frederick
7de770f6a1
Add support for security options in CNB builder container config
...
Closes gh-37479
2023-09-20 13:43:36 -05:00
Scott Frederick
4433fcd1f2
Add support for build workspace option when building images
...
Closes gh-37478
2023-09-20 13:43:35 -05:00
Moritz Halbritter
ec87e65c8f
Merge branch '3.1.x'
...
Closes gh-37461
2023-09-19 16:02:17 +02:00
Moritz Halbritter
ea57988e2f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37460
2023-09-19 16:02:07 +02:00
Moritz Halbritter
2b4afe974a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37459
2023-09-19 16:01:55 +02:00
Moritz Halbritter
6805a3393b
Close file handle on exceptions during connect
...
Closes gh-32423
2023-09-19 15:17:14 +02:00
Moritz Halbritter
f93a497cc6
Merge branch '3.1.x'
...
Closes gh-37423
2023-09-15 15:18:46 +02:00
Moritz Halbritter
ed4b6aaa7b
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37422
2023-09-15 15:18:08 +02:00
Moritz Halbritter
5be826dd4a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37413
2023-09-15 14:47:57 +02:00
Moritz Halbritter
408fb8ae9d
Add support for EdDSA, XDH and RSA-PSS key parsing
...
This works with Java 17 and up. Also refactor the test for more
structure.
Closes gh-37237
2023-09-15 14:15:02 +02:00
Andy Wilkinson
db02f89f03
Merge branch '3.1.x'
...
Closes gh-37184
2023-09-04 08:26:04 +01:00
Andy Wilkinson
c562e8e01f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37183
2023-09-04 08:25:46 +01:00
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
b1547d0139
Merge branch '3.1.x'
...
Closes gh-37171
2023-08-31 22:38:29 -07:00
Phillip Webb
37e67058b7
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37169
2023-08-31 22:24:14 -07: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
3640491d5a
Fix Timezone used for now in BuildRequestTests
2023-08-30 20:34:01 -07:00
Phillip Webb
c142051320
Merge branch '3.1.x'
2023-08-30 20:33:32 -07:00
Phillip Webb
f8f4a2b986
Fix Timezone used for now in BuildRequestTests
2023-08-30 20:33:17 -07:00
Scott Frederick
c17ecf0f0b
Add support for caching to bind mounts when building images
...
When building an image using the Maven `spring-boot:build-image` goal or
the Gradle `bootBuildImage` task, the build and launch caches can be
configured to use a bind mount as an alternative to using a named
volume.
Closes gh-28387
2023-08-21 15:04:39 -05:00
Scott Frederick
eb45aab712
Upgrade default CNB builders to Paketo Jammy
...
Closes gh-36689
2023-08-14 13:29:42 -05:00
Phillip Webb
d73d8f8e4f
Merge branch '3.1.x'
2023-08-13 19:15:56 -07:00
Phillip Webb
848a61a3a8
Merge branch '3.0.x' into 3.1.x
2023-08-13 18:50:33 -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
Moritz Halbritter
7bb337aeb1
Polish tests
2023-08-08 13:12:47 +02:00
Andy Wilkinson
b1d26fe961
Revert "Upgrade default CNB builders to Paketo Jammy"
...
This reverts commit 6506208d29
. The
upgrade to the Jammy builder was causing
failsWhenBuildImageIsInvokedOnMultiModuleProjectWithBuildImageGoal to
hang on CI.
See gh-36689
2023-08-07 12:10:27 +01:00
Scott Frederick
ecdb9f6b07
Add support for CNB platform API 0.12
...
Closes gh-36712
2023-08-03 15:57:36 -05:00
Scott Frederick
6506208d29
Upgrade default CNB builders to Paketo Jammy
...
Closes gh-36689
2023-08-02 19:06:16 -05:00
Andy Wilkinson
b02c1877fc
Fix configIsReadWithProvidedContext on Windows
...
See gh-36445
2023-08-02 14:59:47 +01:00
Scott Frederick
4393a2244c
Use Docker CLI context to determine daemon host address for image building
...
Configuration files managed by the Docker CLI are now used to determine
the host address of the Docker daemon used when building images using
buildpacks when a host address is not configured with environment
variables or build tool plugin configuration.
Closes gh-36445
2023-07-18 13:21:01 -06:00
Scott Frederick
c32877493c
Merge branch '3.1.x'
...
Closes gh-36055
2023-06-23 15:47:00 -06:00
Scott Frederick
b9b314622f
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36054
2023-06-23 15:46:44 -06:00
Scott Frederick
4a3abdd7c3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36053
2023-06-23 15:46:27 -06:00
Johnny Lim
59d4bf97a1
Add Javadoc since to ImageReference.inTaglessForm()
...
See gh-36048
2023-06-23 15:45:29 -06:00
Scott Frederick
90dd7449bb
Merge branch '3.1.x'
...
Closes gh-36051
2023-06-23 15:20:25 -06:00
Scott Frederick
92b2573a60
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36050
2023-06-23 15:20:06 -06: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
Andy Wilkinson
ca5bd37e81
Upgrade to Spring Framework 6.1.0-M1
...
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
Phillip Webb
e3ed87d165
Merge branch '3.0.x'
2023-05-12 13:21:52 -07: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
Phillip Webb
e9c4a5d663
Polish
2023-05-12 13:01:30 -07:00
Moritz Halbritter
e930801eb1
Separate tag in the Docker API tag call
...
Closes gh-35358
2023-05-11 09:52:52 +02: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
Moritz Halbritter
441ed30ee4
Polish "Replace Mockito argument captors with assertArg"
...
Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
See gh-35015
2023-05-05 15:41:31 +02:00
Marc Leroux
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2023-05-05 11:34:55 +02:00
Andy Wilkinson
b8ec7d291d
Upgrade to Jackson Bom 2.15.0-rc2
...
Closes gh-34980
2023-04-14 11:55:20 +01:00
Phillip Webb
e9a198a68f
Merge branch '3.0.x'
2023-04-12 22:16:35 -07:00
Scott Frederick
56bc6d2fa0
Allow image application directory to be configurable
...
An `applicationDirectory` option on the Maven
`spring-boot:build-image` goal and the Gradle `bootBuildImage` task
can be configured to set the location that will be used to upload
application contents to the builder image, and will contain the
application contents in the generated image.
Closes gh-34786
2023-04-07 14:00:00 -05:00
Scott Frederick
5817c8441d
Allow image Created date to be configurable
...
A `createdDate` option on the Maven `spring-boot:build-image` goal
and the Gradle `bootBuildImage` task can be used to set the `Created`
metadata field on a generated OCI image to a specified date or to
the current date.
Closes gh-28798
2023-04-06 15:08:34 -05:00
Andy Wilkinson
bfeeda6fbc
Merge branch '3.0.x'
...
Closes gh-34601
2023-03-14 14:40:50 +00:00
Andy Wilkinson
220c4b671b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34600
2023-03-14 14:40:26 +00:00
Johnny Lim
00f388fa6f
Polish Javadoc since tags for gh-34324
...
See gh-34587
2023-03-14 14:39:10 +00:00
Scott Frederick
dab8b07302
Merge branch '3.0.x'
...
Closes gh-34496
2023-03-06 15:31:09 -06: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
Chintan Radia
a98760125c
Add support for CNB platform API 0.11
...
See gh-34383
2023-03-01 09:24:42 +01:00
Phillip Webb
157091a811
Merge branch '3.0.x'
2023-02-22 18:36:57 -08:00
Phillip Webb
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
Phillip Webb
b07269a018
Merge branch '3.0.x'
2023-02-21 23:20:07 -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
Andy Wilkinson
f595b46bd3
Upgrade to HttpClient5 5.2.1
...
Closes gh-34086
2023-02-06 14:46:05 +00:00
Moritz Halbritter
23f1c896c9
Merge branch '3.0.x'
...
Closes gh-34015
2023-01-31 10:20:36 +01:00
Johnny Lim
bc7fc90550
Replace Base64Utils with JDK's Base64
...
See gh-33967
2023-01-31 10:20:06 +01:00
Phillip Webb
390892f11b
Merge branch '3.0.x'
...
Closes gh-33998
2023-01-26 21:45:57 -08:00
Krzysztof Krason
d3efd7e091
Use try with close
...
See gh-33987
2023-01-26 20:36:38 -08:00
Krzysztof Krason
a9c547e767
Use text blocks
...
See gh-33987
2023-01-26 20:36:01 -08:00
Krzysztof Krason
6e46423983
Use diamond operators
...
See gh-33987
2023-01-26 20:35:08 -08:00
Scott Frederick
1588f9d881
Migrate buildpack-platform to Apache HttpClient 5
...
Closes gh-33533
2023-01-23 13:59:08 -06: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
Scott Frederick
bb684cc0ad
Add support for CNB platform API 0.10
...
Fixes gh-32949
2022-11-03 11:29:02 -05: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
Phillip Webb
e0b67889a8
Use Stream.toList instead of Stream.collect when possible
...
Update code to make use of `Stream.toList()` whenever possible.
Closes gh-28177
2022-10-04 00:29:22 -07:00
dreis2211
65ef8fc51a
Use ByteArrayOutputStream.toString where possible
...
See gh-32534
2022-09-29 15:03:24 +02:00
Phillip Webb
46be4a3f30
Merge branch '2.7.x'
2022-09-08 19:38:18 -07:00
Phillip Webb
e88a682220
Merge branch '2.6.x' into 2.7.x
2022-09-08 19:37:52 -07:00
Scott Frederick
c0cbaa1460
Merge branch '2.7.x'
2022-08-24 13:18:22 -05:00
Scott Frederick
257e236b06
Fix image-building unit tests on Windows
...
See gh-32000
2022-08-24 13:14:39 -05:00
Scott Frederick
2cdaab59f6
Merge branch '2.7.x'
...
Closes gh-32122
2022-08-19 13:57:26 -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
Phillip Webb
22144987e9
Update copyright year of changed files
2022-07-29 12:10:03 +01:00
Phillip Webb
7377d85096
Merge branch '2.7.x'
...
Closes gh-31866
2022-07-26 12:18:14 +01:00