Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencontainers/runtime-spec
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99a1b8d363f7b14286cf90ab7a080142182a1399
Choose a base ref
...
head repository: opencontainers/runtime-spec
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0417be67c8709fad61f34522b367b4e3e7f80143
Choose a head ref
  • 18 commits
  • 17 files changed
  • 4 contributors

Commits on Apr 5, 2017

  1. config: Drop the redundant config.json filename requirement

    Because:
    
    1. This section defines the configuration format, and doesn't need to
       be tied to a particular filename.
    2. The bundle spec (in bundle.md) already has:
    
         This REQUIRED file MUST reside in the root of the bundle
         directory and MUST be named `config.json`.
    
    The config.md line may have been useful when it was added (77d44b1,
    Update runtime.md, 2015-07-16).  But since the bundle.md line landed
    in 106ec2d (Cleanup bundle.md, 2015-10-02, #210), I think it's been
    redundant.
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    wking committed Apr 5, 2017
    Configuration menu
    Copy the full SHA
    c83bdfb View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. config: Require strictly-positive timeout values

    If the timeout value was zero, the hook would always error, and there
    doesn't seem to be much point to that.  And I'm not sure what negative
    timeouts would mean.  By adding this restriction, we do not limit
    useful hook entries, and we give the validation code grounds to warn
    users attempting to validate configs which are poorly defined or have
    useless hook entries.
    
    I'd like to remove the pointer from the Go type to comply with our
    anti-pointer zero-value style (style.md) now that Go's zero-value is
    clearly invalid.  However, there has been maintainer resistance to
    removing the pointer [1] (although I don't think this is consistent
    with previous maintainer statements that we don't need pointers when
    the zero value is invalid [2]).  In order to land the normative spec
    change, this commit keeps the current *int for Hook.Timeout and punts
    a consistent policy to future work.
    
    [1]: #764 (comment)
    [2]: #653 (comment)
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    wking committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    ecf7314 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. Remove range limit

    Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
    zhouhao committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    d417d39 View commit details
    Browse the repository at this point in the history
  2. schema: Fix the error

    Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
    zhouhao committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    79494b2 View commit details
    Browse the repository at this point in the history
  3. schema: Format fix

    Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
    zhouhao committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    11d1ae7 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. config-solaris.md: fix info

    Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
    zhouhao committed May 9, 2017
    Configuration menu
    Copy the full SHA
    ea65eb3 View commit details
    Browse the repository at this point in the history
  2. config-linux: RFC 2119 wording for oomScoreAdj

    The previous wording hinted at, but did not require, this setting to
    be implemented via oom_score_adj.  With the new wording, when proc is
    mounted at /proc, the container process can check this value by
    looking at /proc/self/oom_score_adj.
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    wking committed May 9, 2017
    Configuration menu
    Copy the full SHA
    e9a39e7 View commit details
    Browse the repository at this point in the history
  3. config-linux: RFC 2119 wording for intelRdt

    So we can compliance-test runtimes for these settings.
    
    Also remove the tutorial, since the kernel docs should provide
    sufficient documentation on that front.  The kernel can be patched if
    they do not, and we do not include tutorials for other config-linux
    settings in this spec.
    
    The updated example was recommended by Xiaochen to compensate for the
    removed inline tutorial [1].
    
    [1]: #787 (comment)
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    wking committed May 9, 2017
    Configuration menu
    Copy the full SHA
    b11ade4 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #783 from q384566678/range-limt

    Remove range limit
    crosbymichael authored May 9, 2017
    Configuration menu
    Copy the full SHA
    6a17a38 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #784 from q384566678/schema-fix

    schema: bug fixes
    crosbymichael authored May 9, 2017
    Configuration menu
    Copy the full SHA
    70e2637 View commit details
    Browse the repository at this point in the history
  6. schema: Add 'test' target to the Makefile

    And fill in some known-good and known-bad examples.  We can make this
    as detailed as we want, but this commit just adds enough to know that:
    
    * The full-file spec examples are valid.
    * The JSON Schema can distinguish valid examples from invalid JSON.
    
    This will help catch JSON Schema typos like those being addressed by
    [1].
    
    [1]: #784
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    wking committed May 9, 2017
    Configuration menu
    Copy the full SHA
    0b7efd2 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #787 from wking/intel-rdt-style

    config-linux: RFC 2119 wording for intelRdt
    Mrunal Patel authored May 9, 2017
    Configuration menu
    Copy the full SHA
    9b4b6d7 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #786 from q384566678/fix-solaris

    config-solaris.md: fix info
    crosbymichael authored May 9, 2017
    Configuration menu
    Copy the full SHA
    ee87262 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #785 from wking/schema-tests

    schema: Add 'test' target to the Makefile
    crosbymichael authored May 9, 2017
    Configuration menu
    Copy the full SHA
    8976b0a View commit details
    Browse the repository at this point in the history
  10. Merge pull request #781 from wking/oomScoreAdj-rfc-2119

    config-linux: RFC 2119 wording for oomScoreAdj
    Mrunal Patel authored May 9, 2017
    Configuration menu
    Copy the full SHA
    01ec62d View commit details
    Browse the repository at this point in the history
  11. Merge pull request #764 from wking/strictly-positive-timeout

    config: Require strictly-positive timeout values
    crosbymichael authored May 9, 2017
    Configuration menu
    Copy the full SHA
    e1b2e61 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #756 from wking/config-drop-filename

    config: Drop the redundant config.json filename requirement
    crosbymichael authored May 9, 2017
    Configuration menu
    Copy the full SHA
    5a39b39 View commit details
    Browse the repository at this point in the history
  13. config: Shift oomScoreAdj from linux.resources to process

    The only discussion related to this is in [1,2], where the
    relationship between oomScoreAdj and disableOOMKiller is raised. But
    since 429f936 (Adding cgroups path to the Spec, 2015-09-02, #137)
    resources has been tied to cgroups, and oomScoreAdj is not about
    cgroups.  For example, we currently have (in config-linux.md):
    
      You can configure a container's cgroups via the resources field of
      the Linux configuration.
    
    I suggested we move the property from linux.resources.oomScoreAdj to
    linux.oomScoreAdj so config authors and runtimes don't have to worry
    about what cgroupsPath means if the only entry in resources is
    oomScoreAdj.  Michael responded with [4]:
    
      If anything it should probably go on the process
    
    So that's what this commit does.
    
    I've gone with the four-space indents here to keep Pandoc happy (see
    7795661 (runtime.md: Fix sub-bullet indentation, 2016-06-08, #495),
    but have left the existing entries in this list unchanged to reduce
    churn.
    
    [1]: #236
    [2]: #292
    [3]: #137
    [4]: #782 (comment)
    
    Signed-off-by: W. Trevor King <wking@tremily.us>
    wking committed May 9, 2017
    Configuration menu
    Copy the full SHA
    0417be6 View commit details
    Browse the repository at this point in the history
Loading