From 714dbbda9e1f3ec98d75a07ed4c5442ea6540680 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Wed, 22 Aug 2018 09:12:40 -0400
Subject: 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
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 48988def4..878d2c0b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -104,11 +104,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 cni config
 #RUN make install.cni
-- 
cgit v1.2.3-54-g00ecf