summaryrefslogtreecommitdiff
path: root/test/build
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-08-03 07:27:33 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-03 14:39:07 +0000
commit7462ebe830b256e9e145d133c824de5dfd23045d (patch)
treed545bb2b4c579108e5fb3ecf2717146a182e65cd /test/build
parenta83f54e9c703630ee95e76b1dac3ad375c44c222 (diff)
downloadpodman-7462ebe830b256e9e145d133c824de5dfd23045d.tar.gz
podman-7462ebe830b256e9e145d133c824de5dfd23045d.tar.bz2
podman-7462ebe830b256e9e145d133c824de5dfd23045d.zip
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 <dwalsh@redhat.com> Closes: #1209 Approved by: mheon
Diffstat (limited to 'test/build')
-rw-r--r--test/build/preprocess/Decomposed.in7
-rw-r--r--test/build/preprocess/Error.in5
-rw-r--r--test/build/preprocess/common3
-rw-r--r--test/build/preprocess/install-base3
4 files changed, 18 insertions, 0 deletions
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