opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-29 00:38:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change pause container to infra container

Browse Source 
Signed-off-by: haircommander <pehunt@redhat.com>

Closes: #1187
Approved by: mheon
This commit is contained in:
haircommander
2018-08-17 10:36:51 -04:00
committed by Atomic Bot
parent 697b46430a
commit 2a7449362f
25 changed files with 251 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libpod/container_ffjson.go
View File

@ -1,5 +1,5 @@
// Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
// source: libpod/container.go
// source: /home/pehunt/go/src/github.com/containers/libpod/libpod/container.go
package libpod
@ -517,7 +517,7 @@ func (j *ContainerConfig) MarshalJSONBuf(buf fflib.EncodingBuffer) error {
} else {
buf.WriteString(`null`)
}
if j.IsPause {
if j.IsInfra {
buf.WriteString(`,"pause":true`)
} else {
buf.WriteString(`,"pause":false`)
@ -640,7 +640,7 @@ const (
ffjtContainerConfigLocalVolumes
ffjtContainerConfigIsPause
ffjtContainerConfigIsInfra
)
var ffjKeyContainerConfigSpec = []byte("spec")
@ -753,7 +753,7 @@ var ffjKeyContainerConfigExitCommand = []byte("exitCommand")
var ffjKeyContainerConfigLocalVolumes = []byte("LocalVolumes")
var ffjKeyContainerConfigIsPause = []byte("pause")
var ffjKeyContainerConfigIsInfra = []byte("pause")
// UnmarshalJSON umarshall json - template of ffjson
func (j *ContainerConfig) UnmarshalJSON(input []byte) error {
@ -1060,8 +1060,8 @@ mainparse:
state = fflib.FFParse_want_colon
goto mainparse
} else if bytes.Equal(ffjKeyContainerConfigIsPause, kn) {
currentKey = ffjtContainerConfigIsPause
} else if bytes.Equal(ffjKeyContainerConfigIsInfra, kn) {
currentKey = ffjtContainerConfigIsInfra
state = fflib.FFParse_want_colon
goto mainparse
}
@ -1152,8 +1152,8 @@ mainparse:
}
if fflib.EqualFoldRight(ffjKeyContainerConfigIsPause, kn) {
currentKey = ffjtContainerConfigIsPause
if fflib.EqualFoldRight(ffjKeyContainerConfigIsInfra, kn) {
currentKey = ffjtContainerConfigIsInfra
state = fflib.FFParse_want_colon
goto mainparse
}
@ -1670,8 +1670,8 @@ mainparse:
case ffjtContainerConfigLocalVolumes:
goto handle_LocalVolumes
case ffjtContainerConfigIsPause:
goto handle_IsPause
case ffjtContainerConfigIsInfra:
goto handle_IsInfra
case ffjtContainerConfignosuchkey:
err = fs.SkipField(tok)
@ -3973,9 +3973,9 @@ handle_LocalVolumes:
state = fflib.FFParse_after_value
goto mainparse
handle_IsPause:
handle_IsInfra:
/* handler: j.IsPause type=bool kind=bool quoted=false*/
/* handler: j.IsInfra type=bool kind=bool quoted=false*/
{
if tok != fflib.FFTok_bool && tok != fflib.FFTok_null {
@ -3991,11 +3991,11 @@ handle_IsPause:
if bytes.Compare([]byte{'t', 'r', 'u', 'e'}, tmpb) == 0 {
j.IsPause = true
j.IsInfra = true
} else if bytes.Compare([]byte{'f', 'a', 'l', 's', 'e'}, tmpb) == 0 {
j.IsPause = false
j.IsInfra = false
} else {
err = errors.New("unexpected bytes for true/false value")