mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
bbbddeebba
Pull request https://github.com/docker/docker/pull/27745 added support for the client to talk to older versions of the daemon. Various flags were added to docker 1.13 that are not compatible with older daemons. This PR adds annotations to those flags, so that they are automatically hidden if the daemon is older than docker 1.13 (API 1.25). Not all new flags affect the API (some are client-side only). The following PR's added new flags to docker 1.13 that affect the API; - https://github.com/docker/docker/pull/23430 added `--cpu-rt-period`and `--cpu-rt-runtime` - https://github.com/docker/docker/pull/27800 / https://github.com/docker/docker/pull/25317 added `--group` / `--group-add` / `--group-rm` - https://github.com/docker/docker/pull/27702 added `--network` to `docker build` - https://github.com/docker/docker/pull/25962 added `--attachable` to `docker network create` - https://github.com/docker/docker/pull/27998 added `--compose-file` to `docker stack deploy` - https://github.com/docker/docker/pull/22566 added `--stop-timeout` to `docker run` and `docker create` - https://github.com/docker/docker/pull/26061 added `--init` to `docker run` and `docker create` - https://github.com/docker/docker/pull/26941 added `--init-path` to `docker run` and `docker create` - https://github.com/docker/docker/pull/27958 added `--cpus` on `docker run` / `docker create` - https://github.com/docker/docker/pull/27567 added `--dns`, `--dns-opt`, and `--dns-search` to `docker service create` - https://github.com/docker/docker/pull/27596 added `--force` to `docker service update` - https://github.com/docker/docker/pull/27857 added `--hostname` to `docker service create` - https://github.com/docker/docker/pull/28031 added `--hosts`, `--host-add` / `--host-rm` to `docker service create` and `docker service update` - https://github.com/docker/docker/pull/28076 added `--tty` on `docker service create` / `docker service update` - https://github.com/docker/docker/pull/26421 added `--update-max-failure-ratio`, `--update-monitor` and `--rollback` on `docker service update` - https://github.com/docker/docker/pull/27369 added `--health-cmd`, `--health-interval`, `--health-retries`, `--health-timeout` and `--no-healthcheck` options to `docker service create` and `docker service update` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
165 lines
4.8 KiB
Go
165 lines
4.8 KiB
Go
package container
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/cli"
|
|
"github.com/docker/docker/cli/command"
|
|
runconfigopts "github.com/docker/docker/runconfig/opts"
|
|
"github.com/docker/go-units"
|
|
"github.com/spf13/cobra"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
type updateOptions struct {
|
|
blkioWeight uint16
|
|
cpuPeriod int64
|
|
cpuQuota int64
|
|
cpuRealtimePeriod int64
|
|
cpuRealtimeRuntime int64
|
|
cpusetCpus string
|
|
cpusetMems string
|
|
cpuShares int64
|
|
memoryString string
|
|
memoryReservation string
|
|
memorySwap string
|
|
kernelMemory string
|
|
restartPolicy string
|
|
|
|
nFlag int
|
|
|
|
containers []string
|
|
}
|
|
|
|
// NewUpdateCommand creates a new cobra.Command for `docker update`
|
|
func NewUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
|
|
var opts updateOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "update [OPTIONS] CONTAINER [CONTAINER...]",
|
|
Short: "Update configuration of one or more containers",
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.containers = args
|
|
opts.nFlag = cmd.Flags().NFlag()
|
|
return runUpdate(dockerCli, &opts)
|
|
},
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.Uint16Var(&opts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)")
|
|
flags.Int64Var(&opts.cpuPeriod, "cpu-period", 0, "Limit CPU CFS (Completely Fair Scheduler) period")
|
|
flags.Int64Var(&opts.cpuQuota, "cpu-quota", 0, "Limit CPU CFS (Completely Fair Scheduler) quota")
|
|
flags.Int64Var(&opts.cpuRealtimePeriod, "cpu-rt-period", 0, "Limit the CPU real-time period in microseconds")
|
|
flags.SetAnnotation("cpu-rt-period", "version", []string{"1.25"})
|
|
flags.Int64Var(&opts.cpuRealtimeRuntime, "cpu-rt-runtime", 0, "Limit the CPU real-time runtime in microseconds")
|
|
flags.SetAnnotation("cpu-rt-runtime", "version", []string{"1.25"})
|
|
flags.StringVar(&opts.cpusetCpus, "cpuset-cpus", "", "CPUs in which to allow execution (0-3, 0,1)")
|
|
flags.StringVar(&opts.cpusetMems, "cpuset-mems", "", "MEMs in which to allow execution (0-3, 0,1)")
|
|
flags.Int64VarP(&opts.cpuShares, "cpu-shares", "c", 0, "CPU shares (relative weight)")
|
|
flags.StringVarP(&opts.memoryString, "memory", "m", "", "Memory limit")
|
|
flags.StringVar(&opts.memoryReservation, "memory-reservation", "", "Memory soft limit")
|
|
flags.StringVar(&opts.memorySwap, "memory-swap", "", "Swap limit equal to memory plus swap: '-1' to enable unlimited swap")
|
|
flags.StringVar(&opts.kernelMemory, "kernel-memory", "", "Kernel memory limit")
|
|
flags.StringVar(&opts.restartPolicy, "restart", "", "Restart policy to apply when a container exits")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runUpdate(dockerCli *command.DockerCli, opts *updateOptions) error {
|
|
var err error
|
|
|
|
if opts.nFlag == 0 {
|
|
return errors.New("You must provide one or more flags when using this command.")
|
|
}
|
|
|
|
var memory int64
|
|
if opts.memoryString != "" {
|
|
memory, err = units.RAMInBytes(opts.memoryString)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
var memoryReservation int64
|
|
if opts.memoryReservation != "" {
|
|
memoryReservation, err = units.RAMInBytes(opts.memoryReservation)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
var memorySwap int64
|
|
if opts.memorySwap != "" {
|
|
if opts.memorySwap == "-1" {
|
|
memorySwap = -1
|
|
} else {
|
|
memorySwap, err = units.RAMInBytes(opts.memorySwap)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
var kernelMemory int64
|
|
if opts.kernelMemory != "" {
|
|
kernelMemory, err = units.RAMInBytes(opts.kernelMemory)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
var restartPolicy containertypes.RestartPolicy
|
|
if opts.restartPolicy != "" {
|
|
restartPolicy, err = runconfigopts.ParseRestartPolicy(opts.restartPolicy)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
resources := containertypes.Resources{
|
|
BlkioWeight: opts.blkioWeight,
|
|
CpusetCpus: opts.cpusetCpus,
|
|
CpusetMems: opts.cpusetMems,
|
|
CPUShares: opts.cpuShares,
|
|
Memory: memory,
|
|
MemoryReservation: memoryReservation,
|
|
MemorySwap: memorySwap,
|
|
KernelMemory: kernelMemory,
|
|
CPUPeriod: opts.cpuPeriod,
|
|
CPUQuota: opts.cpuQuota,
|
|
CPURealtimePeriod: opts.cpuRealtimePeriod,
|
|
CPURealtimeRuntime: opts.cpuRealtimeRuntime,
|
|
}
|
|
|
|
updateConfig := containertypes.UpdateConfig{
|
|
Resources: resources,
|
|
RestartPolicy: restartPolicy,
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
var (
|
|
warns []string
|
|
errs []string
|
|
)
|
|
for _, container := range opts.containers {
|
|
r, err := dockerCli.Client().ContainerUpdate(ctx, container, updateConfig)
|
|
if err != nil {
|
|
errs = append(errs, err.Error())
|
|
} else {
|
|
fmt.Fprintln(dockerCli.Out(), container)
|
|
}
|
|
warns = append(warns, r.Warnings...)
|
|
}
|
|
if len(warns) > 0 {
|
|
fmt.Fprintln(dockerCli.Out(), strings.Join(warns, "\n"))
|
|
}
|
|
if len(errs) > 0 {
|
|
return errors.New(strings.Join(errs, "\n"))
|
|
}
|
|
return nil
|
|
}
|