summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-08-09 14:38:52 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-09 19:49:32 +0000
commit38b3abf915de16a0ac2e7ed84bac603f90e88018 (patch)
treea292f5bffea7837128ff73d8e663d20cd91b5856
parent589a5d2d3e6c6a75942c146013b2938ad3492d43 (diff)
downloadpodman-38b3abf915de16a0ac2e7ed84bac603f90e88018.tar.gz
podman-38b3abf915de16a0ac2e7ed84bac603f90e88018.tar.bz2
podman-38b3abf915de16a0ac2e7ed84bac603f90e88018.zip
Add FFJSON to build container
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1248 Approved by: TomSweeneyRedHat
-rw-r--r--Dockerfile6
-rw-r--r--Dockerfile.CentOS6
-rw-r--r--Dockerfile.Fedora6
3 files changed, 18 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index fcbf44296..24be23e46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,6 +104,12 @@ RUN set -x \
&& export GOPATH=/go \
&& go get github.com/onsi/gomega/...
+# Install ffjson
+RUN set -x \
+ && export GOPATH=/go \
+ && go get github.com/pquerna/ffjson \
+ && install -D -m 755 "$GOPATH"/bin/ffjson /usr/bin/
+
# Install cni config
#RUN make install.cni
RUN mkdir -p /etc/cni/net.d/
diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS
index 5eea63e68..ccd4fd154 100644
--- a/Dockerfile.CentOS
+++ b/Dockerfile.CentOS
@@ -61,6 +61,12 @@ RUN set -x \
&& export GOPATH=/go \
&& go get github.com/onsi/gomega/...
+# Install ffjson
+RUN set -x \
+ && export GOPATH=/go \
+ && go get github.com/pquerna/ffjson \
+ && install -D -m 755 "$GOPATH"/bin/ffjson /usr/bin/
+
# Install conmon
ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
RUN set -x \
diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora
index 1bbcbdbf7..983b754b9 100644
--- a/Dockerfile.Fedora
+++ b/Dockerfile.Fedora
@@ -63,6 +63,12 @@ RUN set -x \
&& export GOPATH=/go \
&& go get github.com/onsi/gomega/...
+# Install ffjson
+RUN set -x \
+ && export GOPATH=/go \
+ && go get github.com/pquerna/ffjson \
+ && install -D -m 755 "$GOPATH"/bin/ffjson /usr/bin/
+
# Install conmon
ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
RUN set -x \