Skip to content
This repository was archived by the owner on Mar 18, 2024. It is now read-only.

Add LogConfig and Ulimits(new in docker 1.6). - #99

Merged
vieux merged 1 commit into
samalba:masterfrom
lingdecong:master
May 4, 2015
Merged

Add LogConfig and Ulimits(new in docker 1.6).#99
vieux merged 1 commit into
samalba:masterfrom
lingdecong:master

Conversation

@lingdecong

Copy link
Copy Markdown

Implement the new feature in docker 1.6

dockerclient

Ulimits - A list of ulimits to be set in the container, specified as { "Name": , "Soft": , "Hard": }, for example: Ulimits: { "Name": "nofile", "Soft": 1024, "Hard", 2048 }}

LogConfig - Logging configuration to container, format { "Type": "<driver_name>", "Config": {"key1": "val1"}} Available types:json-file,syslog,none.json-file` logging driver.

Add two types for HostConfig

@lingdecong

Copy link
Copy Markdown
Author

ping @vieux @abronan

@donhcd

donhcd commented May 1, 2015

Copy link
Copy Markdown
Collaborator

LGTM.

I tested by running ContainerCreate with

HostConfig: dockerclient.HostConfig{
                        Ulimits: []dockerclient.Ulimit{
                                {
                                        Name: "nofile",
                                        Soft: 1024,
                                        Hard: 2048,
                                },
                        },
                        LogConfig: dockerclient.LogConfig{
                                Type: "none",
                        },
                },

and the docker inspect for the created container had the expected Ulimits and LogConfig settings - the default seems to be "json-file" logging and no Ulimits.

@donhcd

donhcd commented May 1, 2015

Copy link
Copy Markdown
Collaborator

ping @aluzzardi @ehazlett

@vieux

vieux commented May 4, 2015

Copy link
Copy Markdown
Contributor

LGTM

vieux added a commit that referenced this pull request May 4, 2015
Add LogConfig and Ulimits(new in docker 1.6).
@vieux
vieux merged commit 0e8316d into samalba:master May 4, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants