Skip to content

[1.0.0.rc1] man: add tty option and tfix #162

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

Closed
wking wants to merge 5 commits into from
Closed

[1.0.0.rc1] man: add tty option and tfix #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fd80d4
Merge pull request #145 from Mashimiao/makefile-clean-man-page
Jul 25, 2016
307be40
Merge pull request #143 from hmeng-19/pointer_methods
Jul 25, 2016
2928edb
Merge pull request #146 from Mashimiao/generate-output-remove-unusefu…
Jul 25, 2016
564b30e
Merge pull request #147 from Mashimiao/move-default-cap-to-validate
Jul 25, 2016
562e912
man: add tty option and tfix
Jul 27, 2016
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install: man
install -m 644 completions/bash/ocitools $(PREFIX)/share/bash-completion/completions

clean:
rm -f ocitools runtimetest
rm -f ocitools runtimetest *.1

.PHONY: test .gofmt .govet .golint

Expand Down
8 changes: 4 additions & 4 deletions cmd/ocitools/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ import (
)

var generateFlags = []cli.Flag{
cli.StringFlag{Name: "output", Value: "output", Usage: "output file (defaults to stdout)"},
cli.StringFlag{Name: "output", Usage: "output file (defaults to stdout)"},
cli.StringFlag{Name: "rootfs", Value: "rootfs", Usage: "path to the rootfs"},
cli.BoolFlag{Name: "read-only", Usage: "make the container's rootfs read-only"},
cli.BoolFlag{Name: "privileged", Usage: "enabled privileged container settings"},
cli.BoolFlag{Name: "privileged", Usage: "enable privileged container settings"},
cli.BoolFlag{Name: "no-new-privileges", Usage: "set no new privileges bit for the container process"},
cli.BoolFlag{Name: "tty", Usage: "allocate a new tty for the container process"},
cli.StringFlag{Name: "hostname", Usage: "hostname value for the container"},
cli.IntFlag{Name: "uid", Usage: "uid for the process"},
cli.IntFlag{Name: "gid", Usage: "gid for the process"},
cli.StringSliceFlag{Name: "groups", Usage: "supplementary groups for the process"},
cli.StringSliceFlag{Name: "cap-add", Usage: "add capabilities"},
cli.StringSliceFlag{Name: "cap-drop", Usage: "drop capabilities"},
cli.StringSliceFlag{Name: "cap-add", Usage: "add Linux capabilities"},
cli.StringSliceFlag{Name: "cap-drop", Usage: "drop Linux capabilities"},
cli.StringFlag{Name: "cgroup", Usage: "cgroup namespace"},
cli.StringFlag{Name: "network", Usage: "network namespace"},
cli.StringFlag{Name: "mount", Usage: "mount namespace"},
Expand Down
19 changes: 17 additions & 2 deletions cmd/ocitools/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (

"github.com/Sirupsen/logrus"
"github.com/blang/semver"
"github.com/opencontainers/ocitools/generate"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
)
Expand Down Expand Up @@ -47,6 +46,22 @@ var (
"RLIMIT_RTPRIO",
"RLIMIT_RTTIME",
}
defaultCaps = []string{
"CAP_CHOWN",
"CAP_DAC_OVERRIDE",
"CAP_FSETID",
"CAP_FOWNER",
"CAP_MKNOD",
"CAP_NET_RAW",
"CAP_SETGID",
"CAP_SETUID",
"CAP_SETFCAP",
"CAP_SETPCAP",
"CAP_NET_BIND_SERVICE",
"CAP_SYS_CHROOT",
"CAP_KILL",
"CAP_AUDIT_WRITE",
}
)

var bundleValidateCommand = cli.Command{
Expand Down Expand Up @@ -421,7 +436,7 @@ func envValid(env string) bool {
}

func capValid(capability string) bool {
for _, val := range generate.DefaultCaps {
for _, val := range defaultCaps {
if val == capability {
return true
}
Expand Down
21 changes: 0 additions & 21 deletions generate/default.go
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion man/ocitools-generate.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ inside of the container.
it is unset, create a new namespace. The special *PATH* `host`
removes any existing network namespace from the configuration.

**--no-new-privileges**
**--no-new-privileges**=true|false
Set no new privileges bit for the container process. Setting this flag
will block the container processes from gaining any additional privileges
using tools like setuid apps. It is a good idea to run unprivileged
Expand Down Expand Up @@ -208,6 +208,9 @@ inside of the container.
This command mounts a `tmpfs` at `/tmp` within the container. The supported mount options are the same as the Linux default `mount` flags. If you do not specify any options, the systems uses the following options:
`rw,noexec,nosuid,nodev,size=65536k`.

**--tty**=true|false
Allocate a new tty for the container process. The default is *false*.

**--uid**=UID
Sets the UID used within the container.

Expand Down