From 7462ebe830b256e9e145d133c824de5dfd23045d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 3 Aug 2018 07:27:33 -0400 Subject: Vendor in latest github.com/projectatomic/buildah This adds support for Dockerfile.in and fixes some limits issues on docker build Also adds support for podman build to read Dockerfile from stdin. cat Dockerfile | podman build -f - . Signed-off-by: Daniel J Walsh Closes: #1209 Approved by: mheon --- docs/podman-build.1.md | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs') diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md index 8d1ed9abd..405864256 100644 --- a/docs/podman-build.1.md +++ b/docs/podman-build.1.md @@ -11,6 +11,8 @@ podman\-build - Build a container image using a Dockerfile. The build context directory can be specified as the http(s) URL of an archive, git repository or Dockerfile. +Dockerfiles ending with a ".in" suffix will be preprocessed via CPP(1). This can be useful to decompose Dockerfiles into several reusable parts that can be used via CPP's **#include** directive. Notice, a Dockerfile.in file can still be used by other tools when manually preprocessing them via `cpp -E`. + When the URL is an archive, the contents of the URL is downloaded to a temporary location and extracted before execution. When the URL is an Dockerfile, the Dockerfile is downloaded to a temporary location. @@ -180,6 +182,8 @@ If a build context is not specified, and at least one Dockerfile is a local file, the directory in which it resides will be used as the build context. +If you specify `-f -`, the Dockerfile contents will be read from stdin. + **--force-rm** *bool-value* Always remove intermediate containers after a build, even if the build is unsuccessful. @@ -522,8 +526,12 @@ podman build . podman build -f Dockerfile.simple . +cat ~/Dockerfile | podman build -f - . + podman build -f Dockerfile.simple -f Dockerfile.notsosimple +podman build -f Dockerfile.in ~ + podman build -t imageName . podman build --tls-verify=true -t imageName -f Dockerfile.simple -- cgit v1.2.3-54-g00ecf