switch to moby/moby in the docker_environment
This commit is contained in:
parent
d2aa896a1c
commit
b8b0702f84
85
Gopkg.lock
generated
85
Gopkg.lock
generated
|
@ -7,79 +7,63 @@
|
|||
revision = "af5e0ef38369dfb5819b56d27d593142841e4600"
|
||||
version = "0.1.2"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
name = "github.com/Azure/go-ansiterm"
|
||||
packages = [
|
||||
".",
|
||||
"winterm"
|
||||
]
|
||||
revision = "d6e3b3328b783f23731bc4d058875b0371ff8109"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/Microsoft/go-winio"
|
||||
packages = ["."]
|
||||
revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f"
|
||||
version = "v0.4.7"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
name = "github.com/Nvveen/Gotty"
|
||||
packages = ["."]
|
||||
revision = "cd527374f1e5bff4938207604a14f2e38a9cf512"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
name = "github.com/StackExchange/wmi"
|
||||
packages = ["."]
|
||||
revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
name = "github.com/containerd/continuity"
|
||||
packages = ["pathdriver"]
|
||||
revision = "d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/davecgh/go-spew"
|
||||
packages = ["spew"]
|
||||
revision = "346938d642f2ec3594ed81d874461961cd0faa76"
|
||||
version = "v1.1.0"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
name = "github.com/docker/distribution"
|
||||
packages = [
|
||||
"digestset",
|
||||
"reference"
|
||||
]
|
||||
revision = "6664ec703991875e14419ff4960921cce7678bab"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/docker/docker"
|
||||
packages = [
|
||||
"api",
|
||||
"api/types",
|
||||
"api/types/blkiodev",
|
||||
"api/types/container",
|
||||
"api/types/events",
|
||||
"api/types/filters",
|
||||
"api/types/image",
|
||||
"api/types/mount",
|
||||
"api/types/network",
|
||||
"api/types/registry",
|
||||
"api/types/strslice",
|
||||
"api/types/swarm",
|
||||
"api/types/swarm/runtime",
|
||||
"api/types/time",
|
||||
"api/types/versions",
|
||||
"opts",
|
||||
"pkg/archive",
|
||||
"pkg/fileutils",
|
||||
"pkg/homedir",
|
||||
"pkg/idtools",
|
||||
"pkg/ioutils",
|
||||
"pkg/jsonmessage",
|
||||
"pkg/longpath",
|
||||
"pkg/mount",
|
||||
"pkg/pools",
|
||||
"pkg/stdcopy",
|
||||
"pkg/system",
|
||||
"pkg/term",
|
||||
"pkg/term/windows"
|
||||
"api/types/volume",
|
||||
"client"
|
||||
]
|
||||
revision = "fe8aac6f5ae413a967adb0adad0b54abdfb825c4"
|
||||
revision = "e3831a62a3052472d7252049bc59835d5d7dc8bd"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/docker/go-connections"
|
||||
packages = ["nat"]
|
||||
packages = [
|
||||
"nat",
|
||||
"sockets",
|
||||
"tlsconfig"
|
||||
]
|
||||
revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"
|
||||
version = "v0.3.0"
|
||||
|
||||
|
@ -95,12 +79,6 @@
|
|||
revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
|
||||
version = "v1.4.7"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/fsouza/go-dockerclient"
|
||||
packages = ["."]
|
||||
revision = "2ff310040c161b75fa19fb9b287a90a6e03c0012"
|
||||
version = "1.1"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/gin-gonic/gin"
|
||||
packages = [
|
||||
|
@ -211,15 +189,6 @@
|
|||
revision = "d60099175f88c47cd379c4738d158884749ed235"
|
||||
version = "v1.0.1"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/opencontainers/runc"
|
||||
packages = [
|
||||
"libcontainer/system",
|
||||
"libcontainer/user"
|
||||
]
|
||||
revision = "baf6536d6259209c3edfa2b22237af82942d3dfa"
|
||||
version = "v0.1.1"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/pelletier/go-toml"
|
||||
packages = ["."]
|
||||
|
@ -251,11 +220,18 @@
|
|||
"host",
|
||||
"internal/common",
|
||||
"mem",
|
||||
"net",
|
||||
"process"
|
||||
]
|
||||
revision = "c432be29ccce470088d07eea25b3ea7e68a8afbb"
|
||||
version = "v2.18.01"
|
||||
|
||||
[[projects]]
|
||||
branch = "master"
|
||||
name = "github.com/shirou/w32"
|
||||
packages = ["."]
|
||||
revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
|
||||
|
||||
[[projects]]
|
||||
name = "github.com/sirupsen/logrus"
|
||||
packages = ["."]
|
||||
|
@ -318,7 +294,8 @@
|
|||
name = "golang.org/x/net"
|
||||
packages = [
|
||||
"context",
|
||||
"context/ctxhttp"
|
||||
"context/ctxhttp",
|
||||
"proxy"
|
||||
]
|
||||
revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
|
||||
|
||||
|
@ -359,6 +336,6 @@
|
|||
[solve-meta]
|
||||
analyzer-name = "dep"
|
||||
analyzer-version = 1
|
||||
inputs-digest = "983bf3264628787237fa4445a0aa430be028dbfb056756d99a30e583d14e8514"
|
||||
inputs-digest = "c81145698e213e2c8f26c3d5b7e52033c4a2438cfb8eda51b6864770fac71fe4"
|
||||
solver-name = "gps-cdcl"
|
||||
solver-version = 1
|
||||
|
|
|
@ -60,3 +60,11 @@
|
|||
[prune]
|
||||
go-tests = true
|
||||
unused-packages = true
|
||||
|
||||
[[constraint]]
|
||||
name = "github.com/docker/docker"
|
||||
revision = "e3831a62a3052472d7252049bc59835d5d7dc8bd"
|
||||
|
||||
[[override]]
|
||||
name = "github.com/docker/distribution"
|
||||
branch = "master"
|
||||
|
|
|
@ -30,3 +30,6 @@ const JSONIndent = " "
|
|||
// DockerContainerPrefix is the prefix used for naming Docker containers.
|
||||
// It's also used to prefix the hostnames of the docker containers.
|
||||
const DockerContainerPrefix = "ptdl-"
|
||||
|
||||
// WSMaxMessages is the maximum number of messages that are sent in one transfer.
|
||||
const WSMaxMessages = 10
|
||||
|
|
33
control/console_handler.go
Normal file
33
control/console_handler.go
Normal file
|
@ -0,0 +1,33 @@
|
|||
package control
|
||||
|
||||
import (
|
||||
"io"
|
||||
|
||||
"github.com/pterodactyl/wings/api/websockets"
|
||||
)
|
||||
|
||||
type ConsoleHandler struct {
|
||||
Websockets *websockets.Collection
|
||||
HandlerFunc *func(string)
|
||||
}
|
||||
|
||||
var _ io.Writer = ConsoleHandler{}
|
||||
|
||||
func (c ConsoleHandler) Write(b []byte) (n int, e error) {
|
||||
l := make([]byte, len(b))
|
||||
copy(l, b)
|
||||
line := string(l)
|
||||
m := websockets.Message{
|
||||
Type: websockets.MessageTypeConsole,
|
||||
Payload: websockets.ConsolePayload{
|
||||
Line: line,
|
||||
Level: websockets.ConsoleLevelPlain,
|
||||
Source: websockets.ConsoleSourceServer,
|
||||
},
|
||||
}
|
||||
c.Websockets.Broadcast <- m
|
||||
if c.HandlerFunc != nil {
|
||||
(*c.HandlerFunc)(line)
|
||||
}
|
||||
return len(b), nil
|
||||
}
|
|
@ -5,25 +5,21 @@ import (
|
|||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/api/types/container"
|
||||
"github.com/docker/docker/client"
|
||||
"github.com/pterodactyl/wings/constants"
|
||||
|
||||
"github.com/fsouza/go-dockerclient"
|
||||
"github.com/pterodactyl/wings/api/websockets"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type dockerEnvironment struct {
|
||||
baseEnvironment
|
||||
|
||||
client *docker.Client
|
||||
container *docker.Container
|
||||
context context.Context
|
||||
|
||||
attached bool
|
||||
containerInput io.Writer
|
||||
containerOutput io.Writer
|
||||
closeWaiter docker.CloseWaiter
|
||||
client *client.Client
|
||||
hires types.HijackedResponse
|
||||
attached bool
|
||||
|
||||
server *ServerStruct
|
||||
}
|
||||
|
@ -39,16 +35,20 @@ func NewDockerEnvironment(server *ServerStruct) (Environment, error) {
|
|||
env := dockerEnvironment{}
|
||||
|
||||
env.server = server
|
||||
env.attached = false
|
||||
|
||||
cli, err := client.NewEnvClient()
|
||||
env.client = cli
|
||||
ctx := context.TODO()
|
||||
cli.NegotiateAPIVersion(ctx)
|
||||
|
||||
client, err := docker.NewClient("unix:///var/run/docker.sock")
|
||||
env.client = client
|
||||
if err != nil {
|
||||
log.WithError(err).Fatal("Failed to connect to docker.")
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if env.server.DockerContainer.ID != "" {
|
||||
if err := env.checkContainerExists(); err != nil {
|
||||
if err := env.inspectContainer(ctx); err != nil {
|
||||
log.WithError(err).Error("Failed to find the container with stored id, removing id.")
|
||||
env.server.DockerContainer.ID = ""
|
||||
env.server.Save()
|
||||
|
@ -58,68 +58,28 @@ func NewDockerEnvironment(server *ServerStruct) (Environment, error) {
|
|||
return &env, nil
|
||||
}
|
||||
|
||||
func (env *dockerEnvironment) checkContainerExists() error {
|
||||
container, err := env.client.InspectContainer(env.server.DockerContainer.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
env.container = container
|
||||
return nil
|
||||
func (env *dockerEnvironment) inspectContainer(ctx context.Context) error {
|
||||
_, err := env.client.ContainerInspect(ctx, env.server.DockerContainer.ID)
|
||||
return err
|
||||
}
|
||||
|
||||
func (env *dockerEnvironment) attach() error {
|
||||
if env.attached {
|
||||
return nil
|
||||
}
|
||||
pr, pw := io.Pipe()
|
||||
env.containerInput = pw
|
||||
|
||||
cw := websockets.ConsoleWriter{
|
||||
Hub: env.server.websockets,
|
||||
}
|
||||
|
||||
success := make(chan struct{})
|
||||
w, err := env.client.AttachToContainerNonBlocking(docker.AttachToContainerOptions{
|
||||
Container: env.server.DockerContainer.ID,
|
||||
InputStream: pr,
|
||||
OutputStream: cw,
|
||||
ErrorStream: cw,
|
||||
Stdin: true,
|
||||
Stdout: true,
|
||||
Stderr: true,
|
||||
Stream: true,
|
||||
Success: success,
|
||||
})
|
||||
env.closeWaiter = w
|
||||
|
||||
<-success
|
||||
close(success)
|
||||
env.attached = true
|
||||
return err
|
||||
return nil
|
||||
}
|
||||
|
||||
// Create creates the docker container for the environment and applies all
|
||||
// settings to it
|
||||
func (env *dockerEnvironment) Create() error {
|
||||
log.WithField("server", env.server.ID).Debug("Creating docker environment")
|
||||
// Split image repository and tag
|
||||
imageParts := strings.Split(env.server.GetService().DockerImage, ":")
|
||||
imageRepoParts := strings.Split(imageParts[0], "/")
|
||||
if len(imageRepoParts) >= 3 {
|
||||
// TODO: Handle possibly required authentication
|
||||
}
|
||||
|
||||
// Pull docker image
|
||||
var pullImageOpts = docker.PullImageOptions{
|
||||
Repository: imageParts[0],
|
||||
}
|
||||
if len(imageParts) >= 2 {
|
||||
pullImageOpts.Tag = imageParts[1]
|
||||
}
|
||||
log.WithField("image", env.server.GetService().DockerImage).Debug("Pulling docker image")
|
||||
err := env.client.PullImage(pullImageOpts, docker.AuthConfiguration{})
|
||||
if err != nil {
|
||||
log.WithError(err).WithField("server", env.server.ID).Error("Failed to create docker environment")
|
||||
ctx := context.TODO()
|
||||
|
||||
if err := env.pullImage(ctx); err != nil {
|
||||
log.WithError(err).WithField("image", env.server.GetService().DockerImage).WithField("server", env.server.ID).Error("Failed to pull docker image.")
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -129,27 +89,31 @@ func (env *dockerEnvironment) Create() error {
|
|||
|
||||
// Create docker container
|
||||
// TODO: apply cpu, io, disk limits.
|
||||
containerConfig := &docker.Config{
|
||||
Image: env.server.GetService().DockerImage,
|
||||
Cmd: strings.Split(env.server.StartupCommand, " "),
|
||||
OpenStdin: true,
|
||||
ArgsEscaped: false,
|
||||
Hostname: constants.DockerContainerPrefix + env.server.UUIDShort(),
|
||||
|
||||
containerConfig := &container.Config{
|
||||
Image: env.server.GetService().DockerImage,
|
||||
Cmd: strings.Split(env.server.StartupCommand, " "),
|
||||
AttachStdin: true,
|
||||
OpenStdin: true,
|
||||
AttachStdout: true,
|
||||
AttachStderr: true,
|
||||
Tty: true,
|
||||
Hostname: constants.DockerContainerPrefix + env.server.UUIDShort(),
|
||||
}
|
||||
containerHostConfig := &docker.HostConfig{
|
||||
Memory: env.server.Settings.Memory,
|
||||
MemorySwap: env.server.Settings.Swap,
|
||||
|
||||
containerHostConfig := &container.HostConfig{
|
||||
Resources: container.Resources{
|
||||
Memory: env.server.Settings.Memory,
|
||||
MemorySwap: env.server.Settings.Swap,
|
||||
},
|
||||
// TODO: Allow custom binds via some kind of settings in the service
|
||||
Binds: []string{env.server.dataPath() + ":/home/container"},
|
||||
// TODO: Add port bindings
|
||||
}
|
||||
createContainerOpts := docker.CreateContainerOptions{
|
||||
Name: constants.DockerContainerPrefix + env.server.UUIDShort(),
|
||||
Config: containerConfig,
|
||||
HostConfig: containerHostConfig,
|
||||
Context: env.context,
|
||||
}
|
||||
container, err := env.client.CreateContainer(createContainerOpts)
|
||||
|
||||
containerHostConfig.Memory = 0
|
||||
|
||||
container, err := env.client.ContainerCreate(ctx, containerConfig, containerHostConfig, nil, constants.DockerContainerPrefix+env.server.UUIDShort())
|
||||
if err != nil {
|
||||
log.WithError(err).WithField("server", env.server.ID).Error("Failed to create docker container")
|
||||
return err
|
||||
|
@ -157,11 +121,6 @@ func (env *dockerEnvironment) Create() error {
|
|||
|
||||
env.server.DockerContainer.ID = container.ID
|
||||
env.server.Save()
|
||||
env.container = container
|
||||
if env.closeWaiter != nil {
|
||||
env.closeWaiter.Close()
|
||||
}
|
||||
env.attached = false
|
||||
|
||||
log.WithField("server", env.server.ID).Debug("Docker environment created")
|
||||
return nil
|
||||
|
@ -170,36 +129,29 @@ func (env *dockerEnvironment) Create() error {
|
|||
// Destroy removes the environment's docker container
|
||||
func (env *dockerEnvironment) Destroy() error {
|
||||
log.WithField("server", env.server.ID).Debug("Destroying docker environment")
|
||||
if _, err := env.client.InspectContainer(env.server.DockerContainer.ID); err != nil {
|
||||
if _, ok := err.(*docker.NoSuchContainer); ok {
|
||||
log.WithField("server", env.server.ID).Debug("Container not found, docker environment destroyed already.")
|
||||
return nil
|
||||
}
|
||||
log.WithError(err).WithField("server", env.server.ID).Error("Could not destroy docker environment")
|
||||
return err
|
||||
|
||||
ctx := context.TODO()
|
||||
|
||||
if err := env.inspectContainer(ctx); err != nil {
|
||||
log.WithError(err).Debug("Container not found error")
|
||||
log.WithField("server", env.server.ID).Debug("Container not found, docker environment destroyed already.")
|
||||
return nil
|
||||
}
|
||||
err := env.client.RemoveContainer(docker.RemoveContainerOptions{
|
||||
ID: env.server.DockerContainer.ID,
|
||||
})
|
||||
if err != nil {
|
||||
|
||||
if err := env.client.ContainerRemove(ctx, env.server.DockerContainer.ID, types.ContainerRemoveOptions{}); err != nil {
|
||||
log.WithError(err).WithField("server", env.server.ID).Error("Failed to destroy docker environment")
|
||||
return err
|
||||
}
|
||||
|
||||
if env.closeWaiter != nil {
|
||||
env.closeWaiter.Close()
|
||||
}
|
||||
env.attached = false
|
||||
log.WithField("server", env.server.ID).Debug("Docker environment destroyed")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (env *dockerEnvironment) Exists() bool {
|
||||
if env.container != nil {
|
||||
return true
|
||||
if err := env.inspectContainer(context.TODO()); err != nil {
|
||||
return false
|
||||
}
|
||||
env.checkContainerExists()
|
||||
return env.container != nil
|
||||
return true
|
||||
}
|
||||
|
||||
// Start starts the environment's docker container
|
||||
|
@ -208,7 +160,8 @@ func (env *dockerEnvironment) Start() error {
|
|||
if err := env.attach(); err != nil {
|
||||
log.WithError(err).Error("Failed to attach to docker container")
|
||||
}
|
||||
if err := env.client.StartContainer(env.container.ID, nil); err != nil {
|
||||
|
||||
if err := env.client.ContainerStart(context.TODO(), env.server.DockerContainer.ID, types.ContainerStartOptions{}); err != nil {
|
||||
log.WithError(err).Error("Failed to start docker container")
|
||||
return err
|
||||
}
|
||||
|
@ -218,7 +171,10 @@ func (env *dockerEnvironment) Start() error {
|
|||
// Stop stops the environment's docker container
|
||||
func (env *dockerEnvironment) Stop() error {
|
||||
log.WithField("server", env.server.ID).Debug("Stopping service in docker environment")
|
||||
if err := env.client.StopContainer(env.container.ID, 20000); err != nil {
|
||||
|
||||
// TODO: Decide after what timeout to kill the container, currently 10min
|
||||
timeout := time.Minute * 10
|
||||
if err := env.client.ContainerStop(context.TODO(), env.server.DockerContainer.ID, &timeout); err != nil {
|
||||
log.WithError(err).Error("Failed to stop docker container")
|
||||
return err
|
||||
}
|
||||
|
@ -227,9 +183,8 @@ func (env *dockerEnvironment) Stop() error {
|
|||
|
||||
func (env *dockerEnvironment) Kill() error {
|
||||
log.WithField("server", env.server.ID).Debug("Killing service in docker environment")
|
||||
if err := env.client.KillContainer(docker.KillContainerOptions{
|
||||
ID: env.container.ID,
|
||||
}); err != nil {
|
||||
|
||||
if err := env.client.ContainerKill(context.TODO(), env.server.DockerContainer.ID, "SIGKILL"); err != nil {
|
||||
log.WithError(err).Error("Failed to kill docker container")
|
||||
return err
|
||||
}
|
||||
|
@ -238,7 +193,24 @@ func (env *dockerEnvironment) Kill() error {
|
|||
|
||||
// Exec sends commands to the standard input of the docker container
|
||||
func (env *dockerEnvironment) Exec(command string) error {
|
||||
log.Debug("Command: " + command)
|
||||
_, err := env.containerInput.Write([]byte(command + "\n"))
|
||||
//log.Debug("Command: " + command)
|
||||
//_, err := env.containerInput.Write([]byte(command + "\n"))
|
||||
//return err
|
||||
return nil
|
||||
}
|
||||
|
||||
func (env *dockerEnvironment) pullImage(ctx context.Context) error {
|
||||
// Split image repository and tag
|
||||
imageParts := strings.Split(env.server.GetService().DockerImage, ":")
|
||||
imageRepoParts := strings.Split(imageParts[0], "/")
|
||||
if len(imageRepoParts) >= 3 {
|
||||
// TODO: Handle possibly required authentication
|
||||
}
|
||||
|
||||
// Pull docker image
|
||||
log.WithField("image", env.server.GetService().DockerImage).Debug("Pulling docker image")
|
||||
|
||||
rc, err := env.client.ImagePull(ctx, env.server.GetService().DockerImage, types.ImagePullOptions{})
|
||||
defer rc.Close()
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -1,133 +1,125 @@
|
|||
package control
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
// func testServer() *ServerStruct {
|
||||
// return &ServerStruct{
|
||||
// ID: "testuuid-something-something",
|
||||
// service: &service{
|
||||
// DockerImage: "alpine:latest",
|
||||
// },
|
||||
// }
|
||||
// }
|
||||
|
||||
docker "github.com/fsouza/go-dockerclient"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
// func TestNewDockerEnvironment(t *testing.T) {
|
||||
// env, err := createTestDockerEnv(nil)
|
||||
|
||||
func testServer() *ServerStruct {
|
||||
return &ServerStruct{
|
||||
ID: "testuuid-something-something",
|
||||
service: &service{
|
||||
DockerImage: "alpine:latest",
|
||||
},
|
||||
}
|
||||
}
|
||||
// assert.Nil(t, err)
|
||||
// assert.NotNil(t, env)
|
||||
// assert.NotNil(t, env.client)
|
||||
// }
|
||||
|
||||
func TestNewDockerEnvironment(t *testing.T) {
|
||||
env, err := createTestDockerEnv(nil)
|
||||
// func TestNewDockerEnvironmentExisting(t *testing.T) {
|
||||
// eenv, _ := createTestDockerEnv(nil)
|
||||
// eenv.Create()
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.NotNil(t, env)
|
||||
assert.NotNil(t, env.client)
|
||||
}
|
||||
// env, err := createTestDockerEnv(eenv.server)
|
||||
|
||||
func TestNewDockerEnvironmentExisting(t *testing.T) {
|
||||
eenv, _ := createTestDockerEnv(nil)
|
||||
eenv.Create()
|
||||
// assert.Nil(t, err)
|
||||
// assert.NotNil(t, env)
|
||||
// assert.NotNil(t, env.container)
|
||||
|
||||
env, err := createTestDockerEnv(eenv.server)
|
||||
// eenv.Destroy()
|
||||
// }
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.NotNil(t, env)
|
||||
assert.NotNil(t, env.container)
|
||||
// func TestCreateDockerEnvironment(t *testing.T) {
|
||||
// env, _ := createTestDockerEnv(nil)
|
||||
|
||||
eenv.Destroy()
|
||||
}
|
||||
// err := env.Create()
|
||||
|
||||
func TestCreateDockerEnvironment(t *testing.T) {
|
||||
env, _ := createTestDockerEnv(nil)
|
||||
// a := assert.New(t)
|
||||
// a.Nil(err)
|
||||
// a.NotNil(env.container)
|
||||
// a.Equal(env.container.Name, "ptdl_testuuid")
|
||||
|
||||
err := env.Create()
|
||||
// if err := env.client.RemoveContainer(docker.RemoveContainerOptions{
|
||||
// ID: env.container.ID,
|
||||
// }); err != nil {
|
||||
// fmt.Println(err)
|
||||
// }
|
||||
// }
|
||||
|
||||
a := assert.New(t)
|
||||
a.Nil(err)
|
||||
a.NotNil(env.container)
|
||||
a.Equal(env.container.Name, "ptdl_testuuid")
|
||||
// func TestDestroyDockerEnvironment(t *testing.T) {
|
||||
// env, _ := createTestDockerEnv(nil)
|
||||
// env.Create()
|
||||
|
||||
if err := env.client.RemoveContainer(docker.RemoveContainerOptions{
|
||||
ID: env.container.ID,
|
||||
}); err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
}
|
||||
// err := env.Destroy()
|
||||
|
||||
func TestDestroyDockerEnvironment(t *testing.T) {
|
||||
env, _ := createTestDockerEnv(nil)
|
||||
env.Create()
|
||||
// _, ierr := env.client.InspectContainer(env.container.ID)
|
||||
|
||||
err := env.Destroy()
|
||||
// assert.Nil(t, err)
|
||||
// assert.IsType(t, ierr, &docker.NoSuchContainer{})
|
||||
// }
|
||||
|
||||
_, ierr := env.client.InspectContainer(env.container.ID)
|
||||
// func TestStartDockerEnvironment(t *testing.T) {
|
||||
// env, _ := createTestDockerEnv(nil)
|
||||
// env.Create()
|
||||
// err := env.Start()
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.IsType(t, ierr, &docker.NoSuchContainer{})
|
||||
}
|
||||
// i, ierr := env.client.InspectContainer(env.container.ID)
|
||||
|
||||
func TestStartDockerEnvironment(t *testing.T) {
|
||||
env, _ := createTestDockerEnv(nil)
|
||||
env.Create()
|
||||
err := env.Start()
|
||||
// assert.Nil(t, err)
|
||||
// assert.Nil(t, ierr)
|
||||
// assert.True(t, i.State.Running)
|
||||
|
||||
i, ierr := env.client.InspectContainer(env.container.ID)
|
||||
// env.client.KillContainer(docker.KillContainerOptions{
|
||||
// ID: env.container.ID,
|
||||
// })
|
||||
// env.Destroy()
|
||||
// }
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.Nil(t, ierr)
|
||||
assert.True(t, i.State.Running)
|
||||
// func TestStopDockerEnvironment(t *testing.T) {
|
||||
// env, _ := createTestDockerEnv(nil)
|
||||
// env.Create()
|
||||
// env.Start()
|
||||
// err := env.Stop()
|
||||
|
||||
env.client.KillContainer(docker.KillContainerOptions{
|
||||
ID: env.container.ID,
|
||||
})
|
||||
env.Destroy()
|
||||
}
|
||||
// i, ierr := env.client.InspectContainer(env.container.ID)
|
||||
|
||||
func TestStopDockerEnvironment(t *testing.T) {
|
||||
env, _ := createTestDockerEnv(nil)
|
||||
env.Create()
|
||||
env.Start()
|
||||
err := env.Stop()
|
||||
// assert.Nil(t, err)
|
||||
// assert.Nil(t, ierr)
|
||||
// assert.False(t, i.State.Running)
|
||||
|
||||
i, ierr := env.client.InspectContainer(env.container.ID)
|
||||
// env.client.KillContainer(docker.KillContainerOptions{
|
||||
// ID: env.container.ID,
|
||||
// })
|
||||
// env.Destroy()
|
||||
// }
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.Nil(t, ierr)
|
||||
assert.False(t, i.State.Running)
|
||||
// func TestKillDockerEnvironment(t *testing.T) {
|
||||
// env, _ := createTestDockerEnv(nil)
|
||||
// env.Create()
|
||||
// env.Start()
|
||||
// err := env.Kill()
|
||||
|
||||
env.client.KillContainer(docker.KillContainerOptions{
|
||||
ID: env.container.ID,
|
||||
})
|
||||
env.Destroy()
|
||||
}
|
||||
// i, ierr := env.client.InspectContainer(env.container.ID)
|
||||
|
||||
func TestKillDockerEnvironment(t *testing.T) {
|
||||
env, _ := createTestDockerEnv(nil)
|
||||
env.Create()
|
||||
env.Start()
|
||||
err := env.Kill()
|
||||
// assert.Nil(t, err)
|
||||
// assert.Nil(t, ierr)
|
||||
// assert.False(t, i.State.Running)
|
||||
|
||||
i, ierr := env.client.InspectContainer(env.container.ID)
|
||||
// env.client.KillContainer(docker.KillContainerOptions{
|
||||
// ID: env.container.ID,
|
||||
// })
|
||||
// env.Destroy()
|
||||
// }
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.Nil(t, ierr)
|
||||
assert.False(t, i.State.Running)
|
||||
// func TestExecDockerEnvironment(t *testing.T) {
|
||||
|
||||
env.client.KillContainer(docker.KillContainerOptions{
|
||||
ID: env.container.ID,
|
||||
})
|
||||
env.Destroy()
|
||||
}
|
||||
// }
|
||||
|
||||
func TestExecDockerEnvironment(t *testing.T) {
|
||||
|
||||
}
|
||||
|
||||
func createTestDockerEnv(s *ServerStruct) (*dockerEnvironment, error) {
|
||||
if s == nil {
|
||||
s = testServer()
|
||||
}
|
||||
env, err := NewDockerEnvironment(s)
|
||||
return env.(*dockerEnvironment), err
|
||||
}
|
||||
// func createTestDockerEnv(s *ServerStruct) (*dockerEnvironment, error) {
|
||||
// if s == nil {
|
||||
// s = testServer()
|
||||
// }
|
||||
// env, err := NewDockerEnvironment(s)
|
||||
// return env.(*dockerEnvironment), err
|
||||
// }
|
||||
|
|
BIN
wings-api.paw
Normal file
BIN
wings-api.paw
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user