summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-02-10 11:57:05 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-11 10:21:46 +0000
commitd26266659d8649b36b91e8f8f78f8073007554ac (patch)
tree68f943994c26a639f23ba13fa7e024bbe204f41d /Dockerfile
parent773aa61f6622f52696434d883bb82c7d25125fd8 (diff)
downloadpodman-d26266659d8649b36b91e8f8f78f8073007554ac.tar.gz
podman-d26266659d8649b36b91e8f8f78f8073007554ac.tar.bz2
podman-d26266659d8649b36b91e8f8f78f8073007554ac.zip
Honor ENTRYPOINT in image
When an image has an ENTRYPOINT defined, we should be honoring it. The problem is described in issue #321. Also, added buildah binary to test runtimes for testing entrypoint and will also allow us to test podman build as well. Signed-off-by: baude <bbaude@redhat.com> Closes: #322 Approved by: rhatdan
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile9
1 files changed, 9 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index 941a7e0d3..6a29269b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y \
e2fslibs-dev \
gawk \
gettext \
+ go-md2man \
iptables \
pkg-config \
libaio-dev \
@@ -96,6 +97,14 @@ RUN set -x \
&& cp "$GOPATH"/bin/crictl /usr/bin/ \
&& rm -rf "$GOPATH"
+# Install buildah
+RUN set -x \
+ && export GOPATH=/go \
+ && git clone https://github.com/projectatomic/buildah "$GOPATH/src/github.com/projectatomic/buildah" \
+ && cd "$GOPATH/src/github.com/projectatomic/buildah" \
+ && make \
+ && make install
+
# Install ginkgo
RUN set -x \
&& export GOPATH=/go \