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 /libpod/container.go | |
| 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 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/container.go b/libpod/container.go index ea6cd2ac4..e748cb84d 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -123,6 +123,7 @@ type Container struct { // containerState contains the current state of the container // It is stored on disk in a tmpfs and recreated on reboot +// easyjson:json type containerState struct { // The current state of the running container State ContainerStatus `json:"state"` @@ -183,6 +184,7 @@ type containerState struct { } // ExecSession contains information on an active exec session +// easyjson:json type ExecSession struct { ID string `json:"id"` Command []string `json:"command"` @@ -192,6 +194,7 @@ type ExecSession struct { // ContainerConfig contains all information that was used to create the // container. It may not be changed once created. // It is stored, read-only, on disk +// easyjson:json type ContainerConfig struct { Spec *spec.Spec `json:"spec"` ID string `json:"id"` |