Merge branch '3.3.x'

Closes gh-42083
This commit is contained in:
Phillip Webb 2024-09-01 18:56:14 -07:00
commit 09684295e0
2 changed files with 12 additions and 2 deletions

View File

@ -617,7 +617,12 @@ TIP: With the `podman` CLI installed, the command `podman info --format='{{.Host
==== Docker Configuration for Colima
The plugin can communicate with the Docker daemon provided by https://github.com/abiosoft/colima[Colima].
The `DOCKER_HOST` environment variable can be set by using the command `export DOCKER_HOST=$(docker context inspect colima -f '{{.Endpoints.docker.Host}}').`
The `DOCKER_HOST` environment variable can be set by using the following command:
[source,shell,subs="verbatim,attributes"]
----
$ export DOCKER_HOST=$(docker context inspect colima -f '{{.Endpoints.docker.Host}}')
----
The plugin can also be configured to use Colima daemon by providing connection details similar to those shown in the following example:

View File

@ -523,7 +523,12 @@ TIP: With the `colima` CLI installed, the command `podman info --format='{{.Host
==== Docker Configuration for Colima
The plugin can communicate with the Docker daemon provided by https://github.com/abiosoft/colima[Colima].
The `DOCKER_HOST` environment variable can be set by using the command `export DOCKER_HOST=$(docker context inspect colima -f '{{.Endpoints.docker.Host}}').`
The `DOCKER_HOST` environment variable can be set by using the following command:
[source,shell,subs="verbatim,attributes"]
----
$ export DOCKER_HOST=$(docker context inspect colima -f '{{.Endpoints.docker.Host}}')
----
The plugin can also be configured to use Colima daemon by providing connection details similar to those shown in the following example: