diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc index 4f89412956d..66eb9056c04 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc @@ -5,9 +5,9 @@ Images can be built using the `bootBuildImage` task. The task is automatically created when the `java` plugin is applied and is an instance of {boot-build-image-javadoc}[`BootBuildImage`]. + [[build-image-docker-daemon]] === Docker daemon - The `bootBuildImage` task requires access to a Docker daemon. By default, it will communicate with a Docker daemon over a local connection. This works with https://docs.docker.com/install/[Docker Engine] on all supported platforms without configuration. @@ -18,13 +18,20 @@ The following table shows the environment variables and their values: |=== | Environment variable | Description -| DOCKER_HOST | URL containing the host and port for the Docker daemon - e.g. `tcp://192.168.99.100:2376` -| DOCKER_TLS_VERIFY | Enable secure HTTPS protocol when set to `1` (optional) -| DOCKER_CERT_PATH | Path to certificate and key files for HTTPS (required if `DOCKER_TLS_VERIFY=1`, ignored otherwise) +| DOCKER_HOST +| URL containing the host and port for the Docker daemon - e.g. `tcp://192.168.99.100:2376` + +| DOCKER_TLS_VERIFY +| Enable secure HTTPS protocol when set to `1` (optional) + +| DOCKER_CERT_PATH +| Path to certificate and key files for HTTPS (required if `DOCKER_TLS_VERIFY=1`, ignored otherwise) |=== On Linux and macOS, these environment variables can be set using the command `eval $(minikube docker-env)` after minikube has been started. + + [[build-image-customization]] === Image Customizations The plugin invokes a {buildpacks-reference}/concepts/components/builder/[builder] to orchestrate the generation of an image. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc index 534052a9e14..448bd49a20e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/docs/asciidoc/packaging-oci-image.adoc @@ -1,6 +1,5 @@ [[build-image]] == Packaging OCI Images - The plugin can create an https://github.com/opencontainers/image-spec[OCI image] using https://buildpacks.io/[Cloud Native Buildpacks]. Images can be built using the `build-image` goal. @@ -31,9 +30,9 @@ TIP: While the buildpack runs from an <>, it is no When the `build-image` repackages the application, it applies the same settings as the `repackage` goal would, i.e. dependencies can be excluded using one of the exclude options, and Devtools is automatically excluded by default (you can control that using the `excludeDevtools` property). + [[build-image-docker-daemon]] === Docker daemon - The `build-image` goal requires access to a Docker daemon. By default, it will communicate with a Docker daemon over a local connection. This works with https://docs.docker.com/install/[Docker Engine] on all supported platforms without configuration. @@ -44,14 +43,20 @@ The following table shows the environment variables and their values: |=== | Environment variable | Description -| DOCKER_HOST | URL containing the host and port for the Docker daemon - e.g. `tcp://192.168.99.100:2376` -| DOCKER_TLS_VERIFY | Enable secure HTTPS protocol when set to `1` (optional) -| DOCKER_CERT_PATH | Path to certificate and key files for HTTPS (required if `DOCKER_TLS_VERIFY=1`, ignored otherwise) +| DOCKER_HOST +| URL containing the host and port for the Docker daemon - e.g. `tcp://192.168.99.100:2376` + +| DOCKER_TLS_VERIFY +| Enable secure HTTPS protocol when set to `1` (optional) + +| DOCKER_CERT_PATH +| Path to certificate and key files for HTTPS (required if `DOCKER_TLS_VERIFY=1`, ignored otherwise) |=== On Linux and macOS, these environment variables can be set using the command `eval $(minikube docker-env)` after minikube has been started. + [[build-image-customization]] === Image Customizations The plugin invokes a {buildpacks-reference}/concepts/components/builder/[builder] to orchestrate the generation of an image. diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle index de9c5211ad2..77880bfc9a1 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle @@ -18,5 +18,4 @@ dependencies { testImplementation("io.projectreactor:reactor-test") testImplementation("org.testcontainers:junit-jupiter") testImplementation("org.testcontainers:postgresql") - } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle index 6a36acae380..e62c90ff74a 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle @@ -18,5 +18,4 @@ dependencies { testImplementation("io.projectreactor:reactor-test") testImplementation("org.testcontainers:junit-jupiter") testImplementation("org.testcontainers:postgresql") - }