opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-26 02:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add FFJSON to build container

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #1248
Approved by: TomSweeneyRedHat
This commit is contained in:
Matthew Heon
2018-08-09 14:38:52 -04:00
committed by Atomic Bot
parent 589a5d2d3e
commit 38b3abf915
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -104,6 +104,12 @@ RUN set -x \
&& export GOPATH=/go \ && export GOPATH=/go \
&& go get github.com/onsi/gomega/... && 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 # Install cni config
#RUN make install.cni #RUN make install.cni
RUN mkdir -p /etc/cni/net.d/ RUN mkdir -p /etc/cni/net.d/

6
Dockerfile.CentOS
View File

@ -61,6 +61,12 @@ RUN set -x \
&& export GOPATH=/go \ && export GOPATH=/go \
&& go get github.com/onsi/gomega/... && 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 # Install conmon
ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677 ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
RUN set -x \ RUN set -x \

6
Dockerfile.Fedora
View File

@ -63,6 +63,12 @@ RUN set -x \
&& export GOPATH=/go \ && export GOPATH=/go \
&& go get github.com/onsi/gomega/... && 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 # Install conmon
ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677 ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677
RUN set -x \ RUN set -x \