Skip to content

Commit

Permalink
Merge pull request #20005 from rhatdan/run
Browse files Browse the repository at this point in the history
[CI:DOCS] Fix specification of unix:///run
  • Loading branch information
openshift-merge-robot authored Sep 18, 2023
2 parents 1d7efcb + 03dd5f2 commit 364f989
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions docs/source/locale/ja/LC_MESSAGES/markdown.po
Original file line number Diff line number Diff line change
Expand Up @@ -24256,8 +24256,8 @@ msgstr ""
#: ../../source/markdown/podman-remote.1.md:56
msgid ""
"URL to access Podman service (default from `containers.conf`, rootless "
"\"unix://run/user/$UID/podman/podman.sock\" or as root "
"\"unix://run/podman/podman.sock)."
"\"unix:///run/user/$UID/podman/podman.sock\" or as root "
"\"unix:///run/podman/podman.sock)."
msgstr ""

#: ../../source/markdown/podman-remote.1.md:58
Expand Down Expand Up @@ -24358,7 +24358,7 @@ msgstr ""

#: ../../source/markdown/podman-remote.1.md:77
#: ../../source/markdown/podman.1.md:203
msgid "`unix://run/podman/podman.sock`"
msgid "`unix:///run/podman/podman.sock`"
msgstr ""

#: ../../source/markdown/podman-remote.1.md:79
Expand All @@ -24373,12 +24373,12 @@ msgstr ""

#: ../../source/markdown/podman-remote.1.md:82
#: ../../source/markdown/podman.1.md:208
msgid "unix://run/podman/podman.sock"
msgid "unix:///run/podman/podman.sock"
msgstr ""

#: ../../source/markdown/podman-remote.1.md:83
#: ../../source/markdown/podman.1.md:209
msgid "unix://run/user/$UID/podman/podman.sock"
msgid "unix:///run/user/$UID/podman/podman.sock"
msgstr ""

#: ../../source/markdown/podman-remote.1.md:84
Expand Down Expand Up @@ -31567,8 +31567,8 @@ msgstr ""
#: ../../source/markdown/podman.1.md:183
msgid ""
"URL to access Podman service (default from `containers.conf`, rootless "
"`unix://run/user/$UID/podman/podman.sock` or as root "
"`unix://run/podman/podman.sock`). Setting this option switches the "
"`unix:///run/user/$UID/podman/podman.sock` or as root "
"`unix:///run/podman/podman.sock`). Setting this option switches the "
"**--remote** option to true."
msgstr ""

Expand Down
8 changes: 4 additions & 4 deletions docs/source/markdown/podman-remote.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Log messages above specified level: debug, info, warn, error (default), fatal or

#### **--url**=*value*

URL to access Podman service (default from `containers.conf`, rootless "unix://run/user/$UID/podman/podman.sock" or as root "unix://run/podman/podman.sock).
URL to access Podman service (default from `containers.conf`, rootless "unix:///run/user/$UID/podman/podman.sock" or as root "unix:///run/podman/podman.sock).

- `CONTAINER_HOST` is of the format `<schema>://[<user[:<password>]@]<host>[:<port>][<path>]`
- `CONTAINER_PROXY` is of the format `<socks5|socks5h>://[<user[:<password>]@]<host>[:<port>]`
Expand All @@ -73,13 +73,13 @@ URL value resolution precedence:
- command line value
- environment variable `CONTAINER_HOST`
- `engine.service_destinations` table in containers.conf, excluding the /usr/share/containers directory
- `unix://run/podman/podman.sock`
- `unix:///run/podman/podman.sock`

Remote connections use local containers.conf for default.

Some example URL values in valid formats:
- unix://run/podman/podman.sock
- unix://run/user/$UID/podman/podman.sock
- unix:///run/podman/podman.sock
- unix:///run/user/$UID/podman/podman.sock
- ssh://notroot@localhost:22/run/user/$UID/podman/podman.sock
- ssh://root@localhost:22/run/podman/podman.sock
- tcp://localhost:34451
Expand Down
8 changes: 4 additions & 4 deletions docs/source/markdown/podman.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ it is not compatible with a traditional model where containers persist across re
Default value for this is configured in `containers-storage.conf(5)`.

#### **--url**=*value*
URL to access Podman service (default from `containers.conf`, rootless `unix://run/user/$UID/podman/podman.sock` or as root `unix://run/podman/podman.sock`).
URL to access Podman service (default from `containers.conf`, rootless `unix:///run/user/$UID/podman/podman.sock` or as root `unix:///run/podman/podman.sock`).
Setting this option switches the **--remote** option to true.

- `CONTAINER_HOST` is of the format `<schema>://[<user[:<password>]@]<host>[:<port>][<path>]`
Expand All @@ -200,13 +200,13 @@ URL value resolution precedence:
- command line value
- environment variable `CONTAINER_HOST`
- `engine.service_destinations` table in containers.conf, excluding the /usr/share/containers directory
- `unix://run/podman/podman.sock`
- `unix:///run/podman/podman.sock`

Remote connections use local containers.conf for default.

Some example URL values in valid formats:
- unix://run/podman/podman.sock
- unix://run/user/$UID/podman/podman.sock
- unix:///run/podman/podman.sock
- unix:///run/user/$UID/podman/podman.sock
- ssh://notroot@localhost:22/run/user/$UID/podman/podman.sock
- ssh://root@localhost:22/run/podman/podman.sock
- tcp://localhost:34451
Expand Down
8 changes: 4 additions & 4 deletions pkg/bindings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
)
func main() {
conn, err := bindings.NewConnection(context.Background(), "unix://run/podman/podman.sock")
conn, err := bindings.NewConnection(context.Background(), "unix:///run/podman/podman.sock")
if err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down Expand Up @@ -79,7 +79,7 @@ import (
)
func main() {
conn, err := bindings.NewConnection(context.Background(), "unix://run/podman/podman.sock")
conn, err := bindings.NewConnection(context.Background(), "unix:///run/podman/podman.sock")
if err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down Expand Up @@ -107,7 +107,7 @@ import (
)
func main() {
conn, err := bindings.NewConnection(context.Background(), "unix://run/podman/podman.sock")
conn, err := bindings.NewConnection(context.Background(), "unix:///run/podman/podman.sock")
if err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down Expand Up @@ -137,7 +137,7 @@ import (
)
func main() {
conn, err := bindings.NewConnection(context.Background(), "unix://run/podman/podman.sock")
conn, err := bindings.NewConnection(context.Background(), "unix:///run/podman/podman.sock")
if err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down

0 comments on commit 364f989

Please sign in to comment.