Skip to content

Commit 600b8b4

Browse files
authored
Merge pull request opencontainers#619 from wking/tk/process-header
config: Change “Process configuration” → “Process” header
2 parents b69dcba + bf9694d commit 600b8b4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To provide context for users the following section gives example use cases for e
4242
#### Application Bundle Builders
4343

4444
Application bundle builders can create a [bundle](bundle.md) directory that includes all of the files required for launching an application as a container.
45-
The bundle contains an OCI [configuration file](config.md) where the builder can specify host-independent details such as [which executable to launch](config.md#process-configuration) and host-specific settings such as [mount](config.md#mounts) locations, [hook](config.md#hooks) paths, Linux [namespaces](config-linux.md#namespaces) and [cgroups](config-linux.md#control-groups).
45+
The bundle contains an OCI [configuration file](config.md) where the builder can specify host-independent details such as [which executable to launch](config.md#process) and host-specific settings such as [mount](config.md#mounts) locations, [hook](config.md#hooks) paths, Linux [namespaces](config-linux.md#namespaces) and [cgroups](config-linux.md#control-groups).
4646
Because the configuration includes host-specific settings, application bundle directories copied between two hosts may require configuration adjustments.
4747

4848
#### Hook Developers

config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ See links for details about [mountvol](http://ss64.com/nt/mountvol.html) and [Se
114114
```
115115

116116

117-
## Process configuration
117+
## Process
118118

119119
**`process`** (object, REQUIRED) configures the container process.
120120

glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For example, namespaces, resource limits, and mounts are all part of the contain
1515

1616
## Container namespace
1717

18-
On Linux, a leaf in the [namespace][namespaces.7] hierarchy in which the [configured process](config.md#process-configuration) executes.
18+
On Linux, a leaf in the [namespace][namespaces.7] hierarchy in which the [configured process](config.md#process) executes.
1919

2020
## JSON
2121

runtime.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ The lifecycle describes the timeline of events that happen from when a container
4949
1. OCI compliant runtime's [`create`](runtime.md#create) command is invoked with a reference to the location of the bundle and a unique identifier.
5050
2. The container's runtime environment MUST be created according to the configuration in [`config.json`](config.md).
5151
If the runtime is unable to create the environment specified in the [`config.json`](config.md), it MUST generate an error.
52-
While the resources requested in the [`config.json`](config.md) MUST be created, the user-specified code (from [`process`](config.md#process-configuration)) MUST NOT be run at this time.
52+
While the resources requested in the [`config.json`](config.md) MUST be created, the user-specified code (from [`process`](config.md#process)) MUST NOT be run at this time.
5353
Any updates to [`config.json`](config.md) after this step MUST NOT affect the container.
5454
3. Once the container is created additional actions MAY be performed based on the features the runtime chooses to support.
5555
However, some actions might only be available based on the current state of the container (e.g. only available while it is started).
5656
4. Runtime's [`start`](runtime.md#start) command is invoked with the unique identifier of the container.
57-
The runtime MUST run the user-specified code, as specified by [`process`](config.md#process-configuration).
57+
The runtime MUST run the user-specified code, as specified by [`process`](config.md#process).
5858
5. The container's process is stopped.
5959
This MAY happen due to them erroring out, exiting, crashing or the runtime's [`kill`](runtime.md#kill) operation being invoked.
6060
6. Runtime's [`delete`](runtime.md#delete) command is invoked with the unique identifier of the container.
@@ -102,7 +102,7 @@ Any changes made to the [`config.json`](config.md) file after this operation wil
102102
This operation MUST generate an error if it is not provided the container ID.
103103
Attempting to start a container that does not exist MUST generate an error.
104104
Attempting to start an already started container MUST have no effect on the container and MUST generate an error.
105-
This operation MUST run the user-specified code as specified by [`process`](config.md#process-configuration).
105+
This operation MUST run the user-specified code as specified by [`process`](config.md#process).
106106

107107
Upon successful completion of this operation the `status` property of this container MUST be `running`.
108108

0 commit comments

Comments
 (0)