Skip to content

Commit 51a0f50

Browse files
authored
Merge pull request #32982 from rolfedh/RHDEVDOCS-3033
Bug 1950653: RHDEVDOCS-3033: Add link from build topic to Docker build reference topic
2 parents c88c78e + 1dd29da commit 51a0f50

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

modules/builds-strategy-docker-build-arguments.adoc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
You can set link:http://docs.docker.com/v1.7/reference/api/hub_registry_spec/#docker-registry-1-0[docker build arguments] using the `BuildArgs` array. The build arguments are passed to docker when a build is started.
88

9+
[TIP]
10+
====
11+
See link:https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact[Understand how ARG and FROM interact] in the Dockerfile reference documentation.
12+
====
13+
914
.Procedure
1015

1116
To set docker build arguments, add entries to the `BuildArgs` array, which is located in the `dockerStrategy` definition of the `BuildConfig` object. For example:
@@ -18,3 +23,8 @@ dockerStrategy:
1823
- name: "foo"
1924
value: "bar"
2025
----
26+
27+
[NOTE]
28+
====
29+
Only the `name` and `value` fields are supported. Any settings on the `valueFrom` field are ignored.
30+
====

modules/builds-strategy-docker-build.adoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@
66
[id="builds-strategy-docker-build_{context}"]
77
= Docker build
88

9-
The docker build strategy invokes the docker build command, and it expects a repository with a Dockerfile and all required artifacts in it to produce a runnable image.
9+
{product-title} uses Buildah to build a container image from a Dockerfile. For more information on building container images with Dockerfiles, see link:https://docs.docker.com/engine/reference/builder/[the Dockerfile reference documentation].
10+
11+
[TIP]
12+
====
13+
If you work with build arguments, see link:https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact[Understand how ARG and FROM interact] in the Dockerfile reference documentation.
14+
====

0 commit comments

Comments
 (0)