mirror of
https://github.com/containers/podman.git
synced 2025-08-06 11:32:07 +08:00
@ -277,7 +277,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
|
||||
createFlags.StringSliceVar(
|
||||
&cf.GroupAdd,
|
||||
groupAddFlagName, []string{},
|
||||
"Add additional groups to the primary container process. 'keep-groups' allows container processes to use suplementary groups.",
|
||||
"Add additional groups to the primary container process. 'keep-groups' allows container processes to use supplementary groups.",
|
||||
)
|
||||
_ = cmd.RegisterFlagCompletionFunc(groupAddFlagName, completion.AutocompleteNone)
|
||||
|
||||
|
@ -55,8 +55,8 @@ function branch_dance() {
|
||||
echo
|
||||
echo "Commit author is '$author' (expected 'dependabot')"
|
||||
echo -n "Continue? [y/N] "
|
||||
read ans
|
||||
case "$ans" in
|
||||
read answer
|
||||
case "$answer" in
|
||||
[yY]*) ;;
|
||||
*) exit 1;;
|
||||
esac
|
||||
|
@ -952,7 +952,7 @@ The `container_manage_cgroup` boolean must be enabled for this to be allowed on
|
||||
|
||||
#### **\-\-timeout**=*seconds*
|
||||
|
||||
Maximimum time a container is allowed to run before conmon sends it the kill
|
||||
Maximum time a container is allowed to run before conmon sends it the kill
|
||||
signal. By default containers will run until they exit or are stopped by
|
||||
`podman stop`.
|
||||
|
||||
|
@ -1025,7 +1025,7 @@ setsebool -P container_manage_cgroup true
|
||||
|
||||
#### **\-\-timeout**=*seconds*
|
||||
|
||||
Maximimum time a container is allowed to run before conmon sends it the kill
|
||||
Maximum time a container is allowed to run before conmon sends it the kill
|
||||
signal. By default containers will run until they exit or are stopped by
|
||||
`podman stop`.
|
||||
|
||||
|
@ -301,7 +301,7 @@ type ContainerMiscConfig struct {
|
||||
StopSignal uint `json:"stopSignal,omitempty"`
|
||||
// StopTimeout is the signal that will be used to stop the container
|
||||
StopTimeout uint `json:"stopTimeout,omitempty"`
|
||||
// Timeout is maximimum time a container will run before getting the kill signal
|
||||
// Timeout is maximum time a container will run before getting the kill signal
|
||||
Timeout uint `json:"timeout,omitempty"`
|
||||
// Time container was created
|
||||
CreatedTime time.Time `json:"createdTime"`
|
||||
|
@ -66,7 +66,7 @@ type InspectContainerConfig struct {
|
||||
Secrets []*InspectSecret `json:"Secrets,omitempty"`
|
||||
// Timeout is time before container is killed by conmon
|
||||
Timeout uint `json:"Timeout"`
|
||||
// StopTimeout is time before container is stoped when calling stop
|
||||
// StopTimeout is time before container is stopped when calling stop
|
||||
StopTimeout uint `json:"StopTimeout"`
|
||||
}
|
||||
|
||||
|
@ -270,7 +270,7 @@ var _ = Describe("Podman ps", func() {
|
||||
Expect(result.ExitCode()).To(Equal(0))
|
||||
Expect(result.OutputToString()).To(Equal(cid))
|
||||
|
||||
// Query by trunctated image name should not match ( should return empty output )
|
||||
// Query by truncated image name should not match ( should return empty output )
|
||||
result = podmanTest.Podman([]string{"ps", "-q", "--no-trunc", "-a", "--filter", "ancestor=quay.io/libpod/alpi"})
|
||||
result.WaitWithDefaultTimeout()
|
||||
Expect(result.ExitCode()).To(Equal(0))
|
||||
|
@ -84,4 +84,4 @@ Where To Go From Here
|
||||
|
||||
* Figuring out how/if to run variations with different config files
|
||||
(e.g. running OLD-PODMAN that creates a user libpod.conf, tweaking
|
||||
that in the test, then running NEW-PODMAN upgrate tests)
|
||||
that in the test, then running NEW-PODMAN upgrade tests)
|
||||
|
Reference in New Issue
Block a user