Skip to content

*: Fix --bind -> --mount-bind, etc. #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mashimiao merged 3 commits into from
Jul 12, 2017
Merged

*: Fix --bind -> --mount-bind, etc. #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
286e409
*: Fix --bind -> --mount-bind
wking Jul 11, 2017
509fe84
completions/bash/oci-runtime-tool: Fix --cwd -> --process-cwd
wking Jul 11, 2017
eea5637
completions/bash/oci-runtime-tool: Fix --rootfs -> --rootfs-path
wking Jul 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/oci-runtime-tool/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,11 +623,11 @@ func parseBindMount(s string) (string, string, []string, error) {
case 3:
source, dest, options = bparts[0], bparts[1], strings.Split(bparts[2], ":")
default:
return source, dest, options, fmt.Errorf("--bind should have format src:dest[:options...]")
return source, dest, options, fmt.Errorf("--mount-bind should have format src:dest[:options...]")
}

if source == "" || dest == "" {
return source, dest, options, fmt.Errorf("--bind should have format src:dest[:options...]")
return source, dest, options, fmt.Errorf("--mount-bind should have format src:dest[:options...]")
}
return source, dest, options, nil
}
Expand Down
2 changes: 1 addition & 1 deletion completions/bash/oci-runtime-tool
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ _oci-runtime-tool_generate() {
return
;;

--rootfs|--tmpfs|--bind|--cwd)
--rootfs-path|--tmpfs|--mount-bind|--process-cwd)
case "$cur" in
*:*)
# TODO somehow do _filedir for stuff inside the image, if it's already specified (which is also somewhat difficult to determine)
Expand Down
2 changes: 1 addition & 1 deletion man/oci-runtime-tool-generate.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ tmpfs directories on /generate and /tmp.
If you want messages that are logged in your container to show up in the host's
syslog/journal then you should bind mount the /dev/log directory as follows.

$ oci-runtime-tool generate --bind /dev/log:/dev/log --rootfs-path /var/lib/containers/fedora --args bash
$ oci-runtime-tool generate --mount-bind /dev/log:/dev/log --rootfs-path /var/lib/containers/fedora --args bash

From inside the container you can test this by sending a message to the log.

Expand Down