summaryrefslogtreecommitdiff
path: root/Dockerfile.CentOS
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-08-22 09:12:40 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-24 19:19:43 +0000
commit714dbbda9e1f3ec98d75a07ed4c5442ea6540680 (patch)
tree286da76261791b375441a6d3999f1348c7d1e66e /Dockerfile.CentOS
parentbd080b45305a311542527443e9108c1cfdff3c93 (diff)
downloadpodman-714dbbda9e1f3ec98d75a07ed4c5442ea6540680.tar.gz
podman-714dbbda9e1f3ec98d75a07ed4c5442ea6540680.tar.bz2
podman-714dbbda9e1f3ec98d75a07ed4c5442ea6540680.zip
Swap from FFJSON to easyjson
FFJSON has serialization differences versus stock Go - namely, it does not respect the MarshalText() and UnmarshalText() methods, particularly on []byte, which causes incompatability with pre-FFJSON containers which contained DNS servers. EasyJSON does not have these issues, and might even be slightly faster. Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1322 Approved by: mheon
Diffstat (limited to 'Dockerfile.CentOS')
-rw-r--r--Dockerfile.CentOS6
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS
index 368f9255c..80ade88bb 100644
--- a/Dockerfile.CentOS
+++ b/Dockerfile.CentOS
@@ -61,11 +61,11 @@ RUN set -x \
&& export GOPATH=/go \
&& go get github.com/onsi/gomega/...
-# Install ffjson
+# Install easyjson
RUN set -x \
&& export GOPATH=/go \
- && go get github.com/pquerna/ffjson \
- && install -D -m 755 "$GOPATH"/bin/ffjson /usr/bin/
+ && go get -u github.com/mailru/easyjson/... \
+ && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/
# Install conmon
ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677