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 --- test/build/preprocess/Decomposed.in | 7 +++++++ test/build/preprocess/Error.in | 5 +++++ test/build/preprocess/common | 3 +++ test/build/preprocess/install-base | 3 +++ 4 files changed, 18 insertions(+) create mode 100644 test/build/preprocess/Decomposed.in create mode 100644 test/build/preprocess/Error.in create mode 100644 test/build/preprocess/common create mode 100644 test/build/preprocess/install-base (limited to 'test/build') diff --git a/test/build/preprocess/Decomposed.in b/test/build/preprocess/Decomposed.in new file mode 100644 index 000000000..a532176c8 --- /dev/null +++ b/test/build/preprocess/Decomposed.in @@ -0,0 +1,7 @@ +FROM alpine:latest + +#include "common" + +RUNHELLO + +#include "install-base" diff --git a/test/build/preprocess/Error.in b/test/build/preprocess/Error.in new file mode 100644 index 000000000..282ae5f9e --- /dev/null +++ b/test/build/preprocess/Error.in @@ -0,0 +1,5 @@ +FROM alpine:latest + +#include "common" + +#error diff --git a/test/build/preprocess/common b/test/build/preprocess/common new file mode 100644 index 000000000..15c34f807 --- /dev/null +++ b/test/build/preprocess/common @@ -0,0 +1,3 @@ +#define RUNHELLO RUN echo "Hello world!" + +RUN touch /etc/hello-world.txt diff --git a/test/build/preprocess/install-base b/test/build/preprocess/install-base new file mode 100644 index 000000000..105a323c5 --- /dev/null +++ b/test/build/preprocess/install-base @@ -0,0 +1,3 @@ +RUN apk update + +RUN apk add git curl -- cgit v1.2.3-54-g00ecf