Skip to content

Commit caa0c41

Browse files
authored
Merge pull request #103714 from openshift-cherrypick-robot/cherry-pick-102521-to-enterprise-4.18
[enterprise-4.18] CQA 2.0 AsciiDocDITA vale compliance
2 parents 5bcf1af + 7e09b9d commit caa0c41

10 files changed

+38
-17
lines changed

modules/builds-define-build-inputs.adoc

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
[id="builds-define-build-inputs_{context}"]
77
= Build inputs
88

9-
A build input provides source content for builds to operate on. You can use the following build inputs to provide sources in {product-title}, listed in order of precedence:
9+
[role="_abstract"]
10+
Use different build inputs in {product-title} to provide source content for your builds. Understanding the order of precedence helps ensure your builds use the correct sources.
11+
12+
The following build inputs are available and listed in order of precedence:
1013

1114
ifndef::openshift-online[]
1215
* Inline Dockerfile definitions
@@ -55,24 +58,26 @@ The following example of a source definition includes multiple input types and a
5558
----
5659
source:
5760
git:
58-
uri: https://github.com/openshift/ruby-hello-world.git <1>
61+
uri: https://github.com/openshift/ruby-hello-world.git
5962
ref: "master"
6063
images:
6164
- from:
6265
kind: ImageStreamTag
6366
name: myinputimage:latest
6467
namespace: mynamespace
6568
paths:
66-
- destinationDir: app/dir/injected/dir <2>
69+
- destinationDir: app/dir/injected/dir
6770
sourcePath: /usr/lib/somefile.jar
68-
contextDir: "app/dir" <3>
71+
contextDir: "app/dir"
6972
ifndef::openshift-online[]
70-
dockerfile: "FROM centos:7\nRUN yum install -y httpd" <4>
73+
dockerfile: "FROM centos:7\nRUN yum install -y httpd"
7174
endif::[]
7275
----
73-
<1> The repository to be cloned into the working directory for the build.
74-
<2> `/usr/lib/somefile.jar` from `myinputimage` is stored in `<workingdir>/app/dir/injected/dir`.
75-
<3> The working directory for the build becomes `<original_workingdir>/app/dir`.
76+
where:
77+
78+
`uri`:: Specifies the repository to be cloned into the working directory for the build.
79+
`destinationDir`:: Specifies the repository to be cloned into the working directory for the build.
80+
`contextDir`:: Specifies the working directory for the build becomes `<original_workingdir>/app/dir`.
7681
ifndef::openshift-online[]
77-
<4> A Dockerfile with this content is created in `<original_workingdir>/app/dir`, overwriting any existing file with that name.
82+
`dockerFile`:: A Dockerfile with this content is created in `<original_workingdir>/app/dir`, overwriting any existing file with that name.
7883
endif::[]

modules/images-create-guide-general.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[id="images-create-guide-general_{context}"]
66
= General container image guidelines
77

8-
The following guidelines apply when creating a container image in general, and are independent of whether the images are used on {product-title}.
9-
8+
[role="_abstract"]
9+
Follow fundamental guidelines for creating container images to ensure they are secure, efficient, and reproducible for deployment in {product-title}.
1010

1111
== Reuse images
1212

modules/images-create-guide-openshift.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
[id="images-create-guide-openshift_{context}"]
66
= {product-title}-specific guidelines
77

8-
The following are guidelines that apply when creating container images specifically
9-
for use on {product-title}.
8+
[role="_abstract"]
9+
Use the integrated image-building capabilities of {product-title} to create, manage, and deploy reproducible container images directly from source code or Dockerfiles.
1010
ifdef::openshift-online[]
1111

1212
[id="privileges-and-volume-builds_{context}"]

modules/images-create-guidelines.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
[id="images-create-guidelines_{context}"]
66
= Learning container best practices
77

8+
[role="_abstract"]
89
When creating container images to run on {product-title} there are a number of best practices to consider as an image author to ensure a good experience for consumers of those images. Because images are intended to be immutable and used as-is, the following guidelines help ensure that your images are highly consumable and easy to use on {product-title}.

modules/images-create-metadata.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
[id="images-create-metadata_{context}"]
66
= Including metadata in images
77

8-
Defining image metadata helps {product-title} better consume your container images, allowing {product-title} to create a better experience for developers using your image. For example, you can add metadata to provide helpful descriptions of your image, or offer suggestions on other images that may also be needed.
8+
[role="_abstract"]
9+
Define comprehensive image metadata during creation to ensure {product-title} correctly configures image runtime settings and tracks image lineage and compliance. This helps to provide a better experience for developers using your image.
10+
11+
For example, you can add metadata to provide helpful descriptions of your image, or offer suggestions on other images that may also be needed.
912

1013
This topic only defines the metadata needed by the current set of use cases. Additional metadata or use cases may be added in the future.
1114

modules/images-create-s2i-build.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
[id="images-create-s2i-build_{context}"]
88
= Understanding the source-to-image build process
99

10+
[role="_abstract"]
11+
Leverage the Source-to-image (S2I) process in {product-title} to seamlessly transform application source code into ready-to-run, reproducible container images.
12+
1013
The build process consists of the following three fundamental elements, which are combined into a final container image:
1114

1215
* Sources
13-
* Source-to-image (S2I) scripts
16+
* S2I scripts
1417
* Builder image
1518
1619
S2I generates a Dockerfile with the builder image as the first `FROM` instruction. The Dockerfile generated by S2I is then passed to Buildah.

modules/images-create-s2i-scripts.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
[id="images-create-s2i-scripts_{context}"]
88
= How to write source-to-image scripts
99

10-
You can write source-to-image (S2I) scripts in any programming language, as long as the scripts are executable inside the builder image. S2I supports multiple options providing `assemble`/`run`/`save-artifacts` scripts. All of these locations are checked on each build in the following order:
10+
[role="_abstract"]
11+
Define mandatory Source-to-image (S2I) scripts, such as `assemble` and `run` to enable {product-title} to build, customize, and execute highly reproducible container images.
12+
13+
You can write S2I scripts in any programming language, as long as the scripts are executable inside the builder image. S2I supports multiple options providing `assemble`/`run`/`save-artifacts` scripts. All of these locations are checked on each build in the following order:
1114

1215
. A script specified in the build configuration.
1316
. A script found in the application source `.s2i/bin` directory.

modules/images-create-s2i.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[id="images-create-s2i_{context}"]
88
= Creating images from source code with source-to-image
99

10+
[role="_abstract"]
1011
Source-to-image (S2I) is a framework that makes it easy to write images that take application source code as an input and produce a new image that runs the assembled application as output.
1112

1213
The main advantage of using S2I for building reproducible container images is the ease of use for developers. As a builder image author, you must understand two basic concepts in order for your images to provide the best S2I performance, the build process and S2I scripts.

modules/images-test-s2i.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
[id="images-test-s2i_{context}"]
66
= About testing source-to-image images
77

8-
As an Source-to-Image (S2I) builder image author, you can test your S2I image
8+
[role="_abstract"]
9+
Verify your Source-to-image (S2I) environment and resulting application images to ensure successful, reproducible container deployment within {product-title}.
10+
11+
As an S2I builder image author, you can test your S2I image
912
locally and use the {product-title} build system for automated testing and
1013
continuous integration.
1114

openshift_images/create-images.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="creating-images"]
33
= Creating images
4+
45
include::_attributes/common-attributes.adoc[]
56
:context: create-images
67

78
toc::[]
89

10+
[role="_abstract"]
911
Learn how to create your own container images, based on pre-built images that are ready to help you. The process includes learning best practices for writing images, defining metadata for images, testing images, and using a custom builder workflow to create images to use with {product-title}.
1012
ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
1113
After you create an image, you can push it to the {product-registry}.

0 commit comments

Comments
 (0)