Skip to content
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

Add support for structured config file and lxcri config command. #53

Merged
merged 8 commits into from
May 6, 2021
Merged

Add support for structured config file and lxcri config command. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e56d9d6
cli: Remove environment file support.
r10r May 6, 2021
ed1d988
cli: Assemble ContainerConfig in create command.
r10r May 6, 2021
efc2c25
cli: Refactor for config file support.
r10r May 6, 2021
ba6923e
cli: Load config file and add config subcommand.
r10r May 6, 2021
0da2c11
cli: Add timeouts to configuration.
r10r May 6, 2021
78953a3
cli: Add timeout flags to root cmd.
r10r May 5, 2021
1afa3fb
Update configuration section in CLI documentation.
r10r May 6, 2021
5e47e19
cli: Change default log level.
r10r May 5, 2021
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 @@ -11,7 +11,7 @@ PKG_CONFIG_PATH ?= $(PREFIX)/lib/pkgconfig
# Note: The default pkg-config directory is search after PKG_CONFIG_PATH
# Note: (Exported) environment variables are NOT visible in the environment of the $(shell ...) function.
export PKG_CONFIG_PATH
LDFLAGS=-X main.version=$(COMMIT) -X main.libexecDir=$(LIBEXEC_DIR)
LDFLAGS=-X main.version=$(COMMIT) -X main.defaultLibexecDir=$(LIBEXEC_DIR)
CC ?= cc
SHELL_SCRIPTS = $(shell find . -name \*.sh)
GO_SRC = $(shell find . -name \*.go | grep -v _test.go)
Expand Down
2 changes: 1 addition & 1 deletion cgroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func configureCgroup(rt *Runtime, c *Container) error {
}

func configureCgroupPath(rt *Runtime, c *Container) error {
if rt.SystemdCgroup {
if c.SystemdCgroup {
c.CgroupDir = parseSystemdCgroupPath(c.Spec.Linux.CgroupsPath)
} else {
c.CgroupDir = c.Spec.Linux.CgroupsPath
Expand Down
Loading