diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-22 09:12:40 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-24 19:19:43 +0000 |
| commit | 714dbbda9e1f3ec98d75a07ed4c5442ea6540680 (patch) | |
| tree | 286da76261791b375441a6d3999f1348c7d1e66e /Dockerfile | |
| parent | bd080b45305a311542527443e9108c1cfdff3c93 (diff) | |
| download | podman-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')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
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 |