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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -135,6 +135,8 @@ clean: cmd/podman/varlink/iopodman.go \ libpod/container_ffjson.go \ libpod/pod_ffjson.go \ + libpod/container_easyjson.go \ + libpod/pod_easyjson.go \ $(MANPAGES) ||: ifdef HAS_PYTHON3 $(MAKE) -C contrib/python/podman clean @@ -183,7 +185,7 @@ clientintegration: vagrant-check: BOX=$(BOX) sh ./vagrant.sh -binaries: varlink_generate ffjson_generate podman python +binaries: varlink_generate easyjson_generate podman python test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp @@ -262,7 +264,7 @@ uninstall: .PHONY: install.tools -install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.ffjson +install.tools: .install.gitvalidation .install.gometalinter .install.md2man .install.easyjson .install.gitvalidation: .gopathok if [ ! -x "$(GOBIN)/git-validation" ]; then \ @@ -283,9 +285,9 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins $(GO) get -u github.com/cpuguy83/go-md2man; \ fi -.install.ffjson: .gopathok +.install.easyjson: .gopathok if [ ! -x "$(GOBIN)/ffjson" ]; then\ - $(GO) get -u github.com/pquerna/ffjson; \ + $(GO) get -u github.com/mailru/easyjson/...; \ fi .install.ostree: .gopathok @@ -299,15 +301,15 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man .ins varlink_generate: .gopathok cmd/podman/varlink/iopodman.go varlink_api_generate: .gopathok API.md -ffjson_generate: .gopathok libpod/container_ffjson.go libpod/pod_ffjson.go +easyjson_generate: .gopathok libpod/container_easyjson.go libpod/pod_easyjson.go -libpod/container_ffjson.go: libpod/container.go - rm -f libpod/container_ffjson.go - ffjson $(GOPKGDIR)/libpod/container.go +libpod/container_easyjson.go: libpod/container.go + rm -f libpod/container_easyjson.go + cd "$(GOPKGDIR)" && easyjson ./libpod/container.go -libpod/pod_ffjson.go: libpod/pod.go - rm -f libpod/pod_ffjson.go - ffjson $(GOPKGDIR)/libpod/pod.go +libpod/pod_easyjson.go: libpod/pod.go + rm -f libpod/pod_easyjson.go + cd "$(GOPKGDIR)" && easyjson ./libpod/pod.go .PHONY: install.libseccomp.sudo install.libseccomp.sudo: |