Remove docker binary from weaveexec container
Fixes #2957 - replace `docker stop` with `weaveuitl stop-container` - replace `docker kill` with `weaveutil kill-container` - replace `docker rm` with `weaveutil remove-container` - replace `docker run` with minimal `weaveutil container-run` - replace `docker inspect -f {{.ID}}` with `weaveutil container-id` - replace data-only container `docker create` with `weaveutil create-volume-container` - remove `docker inspect` dependencies from `weave` script `rewrite_etc_hosts` and `with_container_fqdn` - rework `weave` script `check_running` and `check_not_running` to use `weaveutil` - rework `weave version` to use `weaver` /report API or `weaver --version` if not running - rework `weave setup`'s `docker pull` to run locally rather than in `weaveexec` container
This commit is contained in:
1 parent
14c79d2184
commit
8bf08c3cf8
9 files changed
+453
-162
No files matched your search
@@ -3,7 +3,6 @@ FROM DOCKERHUB_USER/weaveARCH_EXT
|
||||
ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"]
|
||||
|
||||
ADD ./sigproxy ./symlink /home/weave/
|
||||
ADD ./docker /usr/bin/
|
||||
ADD ./weavewait /w/w
|
||||
ADD ./weavewait_noop /w-noop/w
|
||||
ADD ./weavewait_nomcast /w-nomcast/w
|
||||
|
||||
+17
-23
@@ -8,7 +8,6 @@ import (
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
docker "github.com/fsouza/go-dockerclient"
|
||||
"github.com/vishvananda/netns"
|
||||
|
||||
weavenet "github.com/weaveworks/weave/net"
|
||||
@@ -70,21 +69,6 @@ func attach(args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func containerPid(containerID string) (int, error) {
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
container, err := c.InspectContainer(containerID)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("unable to inspect container %s: %s", containerID, err)
|
||||
}
|
||||
if container.State.Pid == 0 {
|
||||
return 0, fmt.Errorf("container %s not running", containerID)
|
||||
}
|
||||
return container.State.Pid, nil
|
||||
}
|
||||
|
||||
func processExists(pid int) bool {
|
||||
err := syscall.Kill(pid, syscall.Signal(0))
|
||||
return err == nil || err == syscall.EPERM
|
||||
@@ -119,21 +103,31 @@ func detach(args []string) error {
|
||||
}
|
||||
|
||||
func rewriteEtcHosts(args []string) error {
|
||||
if len(args) < 4 {
|
||||
cmdUsage("rewrite-etc-hosts", "<hosts-path> <fqdn> <image> <cidr>... [name:addr...]")
|
||||
if len(args) < 3 {
|
||||
cmdUsage("rewrite-etc-hosts", "<container-id> <image> <cidr> [name:addr...]")
|
||||
}
|
||||
hostsPath := args[0]
|
||||
fqdn := args[1]
|
||||
image := args[2]
|
||||
containerID := args[0]
|
||||
image := args[1]
|
||||
cidrs := args[2]
|
||||
extraHosts := args[3:]
|
||||
|
||||
container, err := inspectContainer(containerID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
hostsPath := container.HostsPath
|
||||
fqdn := container.Config.Hostname + "." + container.Config.Domainname
|
||||
|
||||
var ips []*net.IPNet
|
||||
for _, cidr := range strings.Fields(args[3]) {
|
||||
for _, cidr := range strings.Fields(cidrs) {
|
||||
_, ipnet, err := net.ParseCIDR(cidr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
ips = append(ips, ipnet)
|
||||
}
|
||||
extraHosts := args[4:]
|
||||
|
||||
docker := os.Getenv("DOCKER_HOST")
|
||||
if docker == "" {
|
||||
docker = "unix:///var/run/docker.sock"
|
||||
|
||||
@@ -0,0 +1,285 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
docker "github.com/fsouza/go-dockerclient"
|
||||
)
|
||||
|
||||
func inspectContainer(containerNameOrID string) (*docker.Container, error) {
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
container, err := c.InspectContainer(containerNameOrID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("unable to inspect container %s: %s", containerNameOrID, err)
|
||||
}
|
||||
return container, nil
|
||||
}
|
||||
|
||||
func containerPid(containerID string) (int, error) {
|
||||
container, err := inspectContainer(containerID)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
|
||||
}
|
||||
|
||||
if container.State.Pid == 0 {
|
||||
return 0, fmt.Errorf("container %s not running", containerID)
|
||||
}
|
||||
return container.State.Pid, nil
|
||||
}
|
||||
|
||||
func containerID(args []string) error {
|
||||
if len(args) < 1 {
|
||||
cmdUsage("container-id", "<container-name-or-short-id>")
|
||||
}
|
||||
|
||||
container, err := inspectContainer(args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Print(container.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
func containerState(args []string) error {
|
||||
if len(args) < 1 {
|
||||
cmdUsage("container-state", "<container-id> [<image-prefix>]")
|
||||
}
|
||||
|
||||
container, err := inspectContainer(args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if len(args) == 1 {
|
||||
fmt.Print(container.State.StateString())
|
||||
} else {
|
||||
imagePrefix := args[1]
|
||||
if strings.HasPrefix(container.Config.Image, imagePrefix) {
|
||||
fmt.Print(container.State.StateString())
|
||||
} else {
|
||||
if container.State.Running {
|
||||
fmt.Print("running image mismatch: ", container.Config.Image)
|
||||
} else {
|
||||
fmt.Print("image mismatch: ", container.Config.Image)
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func containerFQDN(args []string) error {
|
||||
if len(args) < 1 {
|
||||
cmdUsage("container-fqdn", "<container-id>")
|
||||
}
|
||||
|
||||
container, err := inspectContainer(args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
fmt.Print(container.Config.Hostname, ".", container.Config.Domainname)
|
||||
return nil
|
||||
}
|
||||
|
||||
func runContainer(args []string) error {
|
||||
env := []string{}
|
||||
name := ""
|
||||
net := ""
|
||||
pid := ""
|
||||
privileged := false
|
||||
restart := docker.NeverRestart()
|
||||
volumes := []string{}
|
||||
volumesFrom := []string{}
|
||||
|
||||
done := false
|
||||
for i := 0; i < len(args) && !done; {
|
||||
switch args[i] {
|
||||
case "-e", "--env":
|
||||
if v := os.Getenv(args[i+1]); v != "" {
|
||||
env = append(env, args[i+1]+"="+v)
|
||||
} else {
|
||||
env = append(env, args[i+1])
|
||||
}
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
case "--name":
|
||||
name = args[i+1]
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
case "--net":
|
||||
net = args[i+1]
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
case "--pid":
|
||||
pid = args[i+1]
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
case "--privileged":
|
||||
privileged = true
|
||||
args = append(args[:i], args[i+1:]...)
|
||||
case "--restart":
|
||||
restart = docker.RestartPolicy{Name: args[i+1]}
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
case "-v", "--volume":
|
||||
// Must dedup binds, otherwise, container fails creation
|
||||
skip := false
|
||||
for _, v := range volumes {
|
||||
if v == args[i+1] {
|
||||
skip = true
|
||||
}
|
||||
}
|
||||
if !skip {
|
||||
volumes = append(volumes, args[i+1])
|
||||
}
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
case "--volumes-from":
|
||||
volumesFrom = append(volumesFrom, args[i+1])
|
||||
args = append(args[:i], args[i+2:]...)
|
||||
default:
|
||||
done = true
|
||||
}
|
||||
}
|
||||
|
||||
if len(args) < 2 {
|
||||
cmdUsage("run-container", `[options] <image> <cmd> [[<cmd-options>] <cmd-arg1> [<cmd-arg2> ...]]
|
||||
|
||||
-e, --env list Set environment variables
|
||||
--name string Assign a name to the container
|
||||
--net string Network Mode
|
||||
--pid string PID namespace to use
|
||||
--privileged Give extended privileges to this container
|
||||
--restart string Restart policy to apply when a container exits (default "no")
|
||||
-v, --volume list Bind mount a volume
|
||||
--volumes-from list Mount volumes from the specified container(s)
|
||||
`)
|
||||
}
|
||||
|
||||
image := args[0]
|
||||
cmds := args[1:]
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
config := docker.Config{Image: image, Env: env, Cmd: cmds}
|
||||
hostConfig := docker.HostConfig{NetworkMode: net, PidMode: pid, Privileged: privileged, RestartPolicy: restart, Binds: volumes, VolumesFrom: volumesFrom}
|
||||
container, err := c.CreateContainer(docker.CreateContainerOptions{Name: name, Config: &config, HostConfig: &hostConfig})
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to create container: %s", err)
|
||||
}
|
||||
|
||||
err = c.StartContainer(container.ID, &hostConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to start container: %s", err)
|
||||
}
|
||||
|
||||
fmt.Print(container.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
func listContainers(args []string) error {
|
||||
if len(args) > 1 {
|
||||
cmdUsage("list-containers", "[<label>]")
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
opts := docker.ListContainersOptions{All: true}
|
||||
if len(args) == 1 {
|
||||
label := args[0]
|
||||
opts.Filters = map[string][]string{"label": {label}}
|
||||
}
|
||||
|
||||
containers, err := c.ListContainers(opts)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to list containers: %s", err)
|
||||
}
|
||||
|
||||
for _, container := range containers {
|
||||
fmt.Println(container.ID)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func stopContainer(args []string) error {
|
||||
if len(args) < 1 {
|
||||
cmdUsage("stop-container", "<container-id> [<container-id2> ...]")
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
for _, containerID := range args {
|
||||
err = c.StopContainer(containerID, 10)
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to stop container %s: %s", containerID, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func killContainer(args []string) error {
|
||||
if len(args) < 1 {
|
||||
cmdUsage("kill-container", "<container-id> [<container-id2> ...]")
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
for _, containerID := range args {
|
||||
err = c.KillContainer(docker.KillContainerOptions{ID: containerID, Signal: docker.SIGKILL})
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to stop container %s: %s", containerID, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func removeContainer(args []string) error {
|
||||
if len(args) < 1 {
|
||||
cmdUsage("remove-container", "[-f | --force] [-v | --volumes] <container-id> [<container-id2> ...]")
|
||||
}
|
||||
|
||||
force := false
|
||||
volumes := false
|
||||
for i := 0; i < len(args); {
|
||||
switch args[i] {
|
||||
case "--force":
|
||||
case "-f":
|
||||
force = true
|
||||
args = append(args[:i], args[i+1:]...)
|
||||
case "--volumes":
|
||||
case "-v":
|
||||
volumes = true
|
||||
args = append(args[:i], args[i+1:]...)
|
||||
default:
|
||||
i++
|
||||
}
|
||||
}
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
for _, containerID := range args {
|
||||
err = c.RemoveContainer(docker.RemoveContainerOptions{
|
||||
ID: containerID, Force: force, RemoveVolumes: volumes})
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to stop container %s: %s", containerID, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -26,6 +26,15 @@ func init() {
|
||||
"remove-plugin-network": removePluginNetwork,
|
||||
"container-addrs": containerAddrs,
|
||||
"process-addrs": processAddrs,
|
||||
"container-id": containerID,
|
||||
"container-state": containerState,
|
||||
"container-fqdn": containerFQDN,
|
||||
"run-container": runContainer,
|
||||
"list-containers": listContainers,
|
||||
"stop-container": stopContainer,
|
||||
"kill-container": killContainer,
|
||||
"remove-container": removeContainer,
|
||||
"create-volume-container": createVolumeContainer,
|
||||
"attach-container": attach,
|
||||
"detach-container": detach,
|
||||
"configure-arp": configureARP,
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
docker "github.com/fsouza/go-dockerclient"
|
||||
)
|
||||
|
||||
func createVolumeContainer(args []string) error {
|
||||
if len(args) < 3 {
|
||||
cmdUsage("create-volume-container", "<name> <image-name-or-id> <label> [<bind-mount1> <bind-mount2> ...]")
|
||||
}
|
||||
containerName := args[0]
|
||||
image := args[1]
|
||||
label := args[2]
|
||||
bindMounts := args[3:]
|
||||
|
||||
c, err := docker.NewVersionedClientFromEnv("1.18")
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to connect to docker: %s", err)
|
||||
}
|
||||
|
||||
container, err := c.InspectContainer(containerName)
|
||||
if err == nil {
|
||||
fmt.Println("volume container already exists " + containerName + ":" + container.ID)
|
||||
return nil
|
||||
}
|
||||
|
||||
volumes := make(map[string]struct{})
|
||||
for _, m := range bindMounts {
|
||||
volumes[m] = struct{}{}
|
||||
}
|
||||
labels := map[string]string{label: ""}
|
||||
config := docker.Config{Image: image, Volumes: volumes, Labels: labels, Entrypoint: []string{"data-only"}}
|
||||
hostConfig := docker.HostConfig{}
|
||||
container, err = c.CreateContainer(docker.CreateContainerOptions{Name: containerName, Config: &config, HostConfig: &hostConfig})
|
||||
if err != nil {
|
||||
return fmt.Errorf("unable to create container: %s", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user