Skip to content

Commit 7909d1a

Browse files
ahardin-rhahardin-rh
committed
[online-3.6] Replaced DITAA images with PNG files
(cherry picked from commit 8195b8d) xref:#7615
1 parent 61cfb58 commit 7909d1a

File tree

4 files changed

+3
-86
lines changed

4 files changed

+3
-86
lines changed

‎architecture/core_concepts/containers_and_images.adoc

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
toc::[]
1313

14-
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
15-
1614
[[containers]]
1715
== Containers
1816

@@ -85,7 +83,7 @@ Rather than version numbers, the Docker service allows applying tags (such as
8583
further specify the image desired, so you may see the same image referred to as
8684
`centos` (implying the `latest` tag), `centos:centos7`, or `fd44297e2ddb`.
8785

88-
[[WARNING]]
86+
[WARNING]
8987
====
9088
Do not use the `latest` tag for any official {product-title} images. These are
9189
images that start with `openshift3/`. `latest` can refer to a number of
@@ -118,54 +116,7 @@ provides its own registry, the link:https://registry.hub.docker.com/[Docker Hub]
118116
registry at `registry.access.redhat.com` for subscribers. {product-title} can
119117
also supply its own internal registry for managing custom container images.
120118

121-
ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]
122119
The relationship between containers, images, and registries is depicted in the
123120
following diagram:
124121

125-
[ditaa, "docker-diagram"]
126-
----
127-
128-
+---------+ +--------------------------------------+
129-
| Built | | Registry service |
130-
| image | docker push | |
131-
| "myapp" +-------------> | +-------------+ +--------+ |
132-
| | | | myapp:v0.1 | | image2 | ... |
133-
+---------+ | | +------------+ +--------+ |
134-
| | | myapp:v0.2 | |
135-
| +--| +-----------+ |
136-
| +--| ... | |
137-
| +-----------+ |
138-
| |
139-
+------------------+-------------------+
140-
:
141-
| docker pull
142-
|
143-
+-----------------------+---------+------------------ ...
144-
| |
145-
| |
146-
v v
147-
+------------------------+ +------------------------+
148-
| | | |
149-
| /-------------------\ | | /-------------------\ |
150-
| | Container 1 | | | | Container 1 | |
151-
| | +--------------+ | | | | +--------------+ | |
152-
| | | myapp:latest | | | | | | myapp:latest | | |
153-
| | +--------------+ | | | | +--------------+ | |
154-
| \-------------------/ | | \-------------------/ |
155-
| | | |
156-
| /-------------------\ | | /-------------------\ |
157-
| | Container 2 | | | | Container 2 | |
158-
| | +--------------+ | | | | +--------------+ | |
159-
| | | image2 | | | | | | image3 | | |
160-
| | +--------------+ | | | | +--------------+ | |
161-
| \-------------------/ | | \-------------------/ |
162-
| | | |
163-
| ... | | ... |
164-
| | | |
165-
| Host 1 | | Host 2 | ...
166-
+------------------------+ +------------------------+
167-
168-
169-
170-
----
171-
endif::[]
122+
image::docker-diagram.png[Docker Diagram]

‎architecture/core_concepts/images/docker-diagram.png

80.7 KB
Loading

‎dev_guide/builds/advanced_build_operations.adoc

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -148,41 +148,7 @@ desired artifacts, and the second build can use any strategy that can consume
148148
input content from an image.
149149
====
150150

151-
[ditaa, "chained-build"]
152-
----
153-
154-
+---------+
155-
| S2I | +----------+
156-
| Builder | + | Source |
157-
| Image | +----+-----+
158-
+---------+ |
159-
| |
160-
| +-----------+ |
161-
+->| S2I Build |<-+
162-
+-----+-----+
163-
|
164-
v
165-
+---------------+ +--------------+
166-
| Image with | | Runtime | +--------------+
167-
| Binary | + | Image | + | Dockerfile |
168-
| Artifact | +-------+------+ +------+-------+
169-
+-------+-------+ | |
170-
| | |
171-
| v |
172-
| +--------------+ |
173-
| | Docker Build | |
174-
+-------------->| with |<--------------+
175-
| Image Source |
176-
+--------------+
177-
|
178-
|
179-
v
180-
+---------------+
181-
| Runtime Image |
182-
| with Compiled |
183-
| Artifact |
184-
+---------------+
185-
----
151+
image::chained-build.png[Chained Build]
186152

187153
The first build takes the application source and produces an image containing a
188154
WAR file. The image is pushed to the `artifact-image` image stream. The path of

‎dev_guide/builds/images/chained-build.png

70.4 KB
Loading

0 commit comments

Comments
 (0)