Skip to content

Corrected max-file option - was incorrectly spelt as max-files - #1670

Merged
thaJeztah merged 1 commit into
docker:masterfrom
stevejr:correct-dockerd-max-file-opt
Feb 13, 2019
Merged

Corrected max-file option - was incorrectly spelt as max-files#1670
thaJeztah merged 1 commit into
docker:masterfrom
stevejr:correct-dockerd-max-file-opt

Conversation

@stevejr

Copy link
Copy Markdown

Signed-off-by: stevejr <>

- What I did

- How I did it

- How to verify it
Used the option spelt as max-files and confirmed the docker daemon would not restart. Amended to max-file and it started

- Description for the changelog

Corrected the spelling of the max-file sub-option for log-opts - was spelt as max-files but should be max-file as per https://docs.docker.com/config/containers/logging/json-file/

- A picture of a cute animal (not mandatory but encouraged)

@GordonTheTurtle

Copy link
Copy Markdown

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "correct-dockerd-max-file-opt" git@github.com:stevejr/cli.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #1670 into master will not change coverage.
The diff coverage is n/a.

@@ Coverage Diff @@## master #1670 +/- ##
=======================================
Coverage 56.12% 56.12% =======================================
Files 306 306 Lines 20964 20964 =======================================
Hits 11766 11766 Misses 8345 8345 Partials 853 853

@thaJeztah

Copy link
Copy Markdown
Member

Nice catch, thanks!

Confirmed that this is the correct name for this option;

mkdir -p /etc/docker
echo'{"log-opts": {"max-files":"5"}}'> /etc/docker/daemon.json
dockerd
...
Error starting daemon: failed to set log opts: unknown log opt 'max-files'for json-file log driver
echo'{"log-opts": {"max-file":"5"}}'> /etc/docker/daemon.json
...
INFO[2019-02-13T12:04:36.215638800Z] Daemon has completed initialization INFO[2019-02-13T12:04:36.226260100Z] API listen on /var/run/docker.sock 

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes look good to me, but looks like there's an issue with the DCO sign off;

Signed-off-by: stevejr <>

Can you change this to your real name (Steve Richards), and set your e-mail address between the brackets (<your e-mail address>? Otherwise CI won't pass 😅

Signed-off-by: Steve Richards <steve.richards@docker.com>
@stevejr
stevejrforce-pushed the correct-dockerd-max-file-opt branch from 2e3ee6b to 04f8800CompareFebruary 13, 2019 12:31
@stevejr

Copy link
Copy Markdown
Author

@thaJeztah - Signed off text changed

@thaJeztahthaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@thaJeztah
thaJeztah merged commit db166da into docker:masterFeb 13, 2019
@GordonTheTurtleGordonTheTurtle added this to the 19.03.0 milestone Feb 13, 2019
@stevejr
stevejr deleted the correct-dockerd-max-file-opt branch February 13, 2019 13:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@stevejr@GordonTheTurtle@codecov-io@thaJeztah