Skip to content

Commit 70372d3

Browse files
committed
*.md: update TOC and links
Some of the docs were not even linked to, and did not have a logic outline for their grouping. Signed-off-by: Vincent Batts <[email protected]>
1 parent a28afa1 commit 70372d3

File tree

8 files changed

+23
-10
lines changed

8 files changed

+23
-10
lines changed

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ Table of Contents
77

88
- [Container Principles](principles.md)
99
- [Filesystem Bundle](bundle.md)
10-
- [Container Configuration](config.md)
11-
- [Linux Specific Configuration](config-linux.md)
10+
- Configuration
11+
- [Container Configuration](config.md)
12+
- [Container Configuration (Linux-specific)](config-linux.md)
13+
- [Runtime Configuration](runtime-config.md)
14+
- [Runtime Configuration (Linux-specific)](runtime-config-linux.md)
1215
- [Runtime and Lifecycle](runtime.md)
16+
- [Linux Specific Runtime](runtime-linux.md)
1317
- [Implementations](implementations.md)
1418

15-
## Use Cases
19+
# Use Cases
1620

1721
To provide context for users the following section gives example use cases for each part of the spec.
1822

bundle.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Bundle Container Format
1+
# Bundle
2+
3+
## Container Format
24

35
This section defines a format for encoding a container as a *bundle* - a directory organized in a certain way, and containing all the necessary data and metadata for any compliant runtime to perform all standard operations against it.
46
See also [OS X application bundles](http://en.wikipedia.org/wiki/Bundle_%28OS_X%29) for a similar use of the term *bundle*.
@@ -14,15 +16,18 @@ A standard container bundle is made of the following 3 parts:
1416
- One or more content directories
1517
- A configuration file
1618

17-
# Directory layout
19+
## Directory layout
1820

1921
A Standard Container bundle is a directory containing all the content needed to load and run a container.
2022
This includes two configuration files `config.json` and `runtime.json`, and a rootfs directory.
2123
The `config.json` file contains settings that are host independent and application specific such as security permissions, environment variables and arguments.
2224
The `runtime.json` file contains settings that are host specific such as memory limits, local device access and mount points.
2325
The goal is that the bundle can be moved as a unit to another machine and run the same application if `runtime.json` is removed or reconfigured.
2426

25-
The syntax and semantics for `config.json` are described in [this specification](config.md).
27+
Configuration file syntax and semantics:
28+
29+
* [`config.json`](config.md) (immutable, host independent configuration)
30+
* [`runtime.json`](runtime-config.md) (mutable, host dependent configuration)
2631

2732
A single `rootfs` directory MUST be in the same directory as the `config.json`.
2833
The names of the directories may be arbitrary, but users should consider using conventional names as in the example below.

code-of-conduct.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
Behave as a community member, follow the code of conduct.
44

5-
65
## Code of Conduct
76

87
The OpenContainers community is made up of a mixture of professionals and volunteers from all over the world.
@@ -36,4 +35,3 @@ By adopting this Code of Conduct, project maintainers commit themselves to fairl
3635
Thanks to the [Fedora Code of Conduct](https://getfedora.org/code-of-conduct) and [Contributor Covenant](http://contributor-covenant.org) for inspiration and ideas.
3736

3837
Portions of this Code of Conduct are adapted from the Contributor Covenant, version 1.2.0, available at http://contributor-covenant.org/version/1/2/0/
39-

config-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Linux-specific configuration
1+
# Linux-specific Container Configuration
22

33
The Linux container specification uses various kernel features like namespaces, cgroups, capabilities, LSM, and file system jails to fulfill the spec.
44
Additional information is needed for Linux over the [default spec configuration](config.md) in order to configure these various kernel features.

config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Configuration file
1+
# Container Configuration file
22

33
The container's top-level directory MUST contain a configuration file called `config.json`.
44
For now the canonical schema is defined in [config.go](config.go) and [config_linux.go](config_linux.go), but this will be moved to a formal JSON schema over time.

runtime-config-linux.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Linux-specific Runtime Configuration
2+
13
## Namespaces
24

35
A namespace wraps a global system resource in an abstraction that makes it appear to the processes within the namespace that they have their own isolated instance of the global resource.

runtime-config.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Runtime Configuration
2+
13
## Mount Configuration
24

35
Additional filesystems can be declared as "mounts", specified in the *mounts* object.

runtime-linux.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Linux Runtime
2+
13
## File descriptors
24
By default, only the `stdin`, `stdout` and `stderr` file descriptors are kept open for the application by the runtime.
35

0 commit comments

Comments
 (0)