Skip to content

Commit 0d17a24

Browse files
authored
Merge pull request #13670 from bmcelvee/images-followup
PR13300-follow-up images and image streams
2 parents 6117378 + 7565581 commit 0d17a24

33 files changed

+801
-748
lines changed

_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ Name: Images
152152
Dir: openshift_images
153153
Distros: openshift-*
154154
Topics:
155-
- Name: Understand containers, images and image streams
155+
- Name: Understanding containers, images, and image streams
156156
File: images-understand
157157
- Name: Creating images
158-
File: images-create
158+
File: create-images
159159
- Name: Managing image streams
160160
File: image-streams-manage
161161
- Name: Using templates

modules/containers-about.adoc

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,36 @@
22
// * assembly/openshift_images
33

44
[id='containers-about_{context}']
5-
= What is a container?
5+
= Containers
66

77
The basic units of {product-title} applications are called _containers_.
88
link:https://access.redhat.com/articles/1353593[Linux container technologies]
99
are lightweight mechanisms for isolating running processes so that they are
10-
limited to interacting with only their designated resources.
11-
The word "container" is defined as a specific running or paused instance of a container image.
10+
limited to interacting with only their designated resources. The word
11+
container is defined as a specific running or paused instance of a container
12+
image.
1213

1314
Many application instances can be running in containers on a single host without
1415
visibility into each others' processes, files, network, and so on. Typically,
15-
each container provides a single service (often called a "micro-service"), such
16+
each container provides a single service, often called a micro-service, such
1617
as a web server or a database, though containers can be used for arbitrary
1718
workloads.
1819

1920
The Linux kernel has been incorporating capabilities for container technologies
20-
for years. The Docker project developed a convenient
21-
management interface for Linux containers on a host.
22-
More recently, the link:https://github.com/opencontainers/[Open Container Initiative]
23-
has developed open standards for container formats and container runtimes.
24-
{product-title} and
25-
Kubernetes add the ability to orchestrate OCI- and Docker-formatted containers across
26-
multi-host installations.
21+
for years. The Docker project developed a convenient management interface for
22+
Linux containers on a host. More recently, the
23+
link:https://github.com/opencontainers/[Open Container Initiative] has developed
24+
open standards for container formats and container runtimes. {product-title} and
25+
Kubernetes add the ability to orchestrate OCI- and Docker-formatted containers
26+
across multi-host installations.
2727

2828
Though you do not directly interact with container runtimes when using
2929
{product-title}, understanding their capabilities and terminology is
3030
important for understanding their role in {product-title} and how your
3131
applications function inside of containers.
3232

33-
Tools such as link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html-single/managing_containers/#using_podman_to_work_with_containers[podman] can be used to replace `docker` command-line
34-
tools for running and managing containers directly.
35-
Using `podman`, you can experiment with containers separately from {product-title}.
33+
Tools such as
34+
link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html-single/managing_containers/#using_podman_to_work_with_containers[podman]
35+
can be used to replace `docker` command-line tools for running and managing
36+
containers directly. Using `podman`, you can experiment with containers
37+
separately from {product-title}.

modules/image-id-about.adoc

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)