mirror of
https://github.com/bingohuang/docker-labs.git
synced 2025-10-04 17:33:21 +08:00
Change import paths
Add session cleanup
This commit is contained in:
@@ -4,7 +4,7 @@ import (
|
||||
"log"
|
||||
"strings"
|
||||
|
||||
ptypes "github.com/xetorthio/play-with-docker/types"
|
||||
ptypes "github.com/franela/play-with-docker/types"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/api/types/container"
|
||||
@@ -39,6 +39,16 @@ func CreateNetwork(name string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func DeleteNetwork(id string) error {
|
||||
err := c.NetworkRemove(context.Background(), id)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func GetExecConnection(id string, ctx context.Context) (*types.HijackedResponse, error) {
|
||||
conf := types.ExecConfig{Tty: true, AttachStdin: true, AttachStderr: true, AttachStdout: true, Cmd: []string{"sh"}}
|
||||
resp, err := c.ContainerExecCreate(ctx, id, conf)
|
||||
|
@@ -1,6 +1,6 @@
|
||||
package services
|
||||
|
||||
import "github.com/xetorthio/play-with-docker/types"
|
||||
import "github.com/franela/play-with-docker/types"
|
||||
|
||||
var instances map[string]map[string]*types.Instance
|
||||
|
||||
|
@@ -1,8 +1,11 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"github.com/franela/play-with-docker/types"
|
||||
"github.com/twinj/uuid"
|
||||
"github.com/xetorthio/play-with-docker/types"
|
||||
)
|
||||
|
||||
var sessions map[string]*types.Session
|
||||
@@ -19,6 +22,16 @@ func NewSession() (*types.Session, error) {
|
||||
//TODO: Store in something like redis
|
||||
sessions[s.Id] = s
|
||||
|
||||
// Schedule cleanup of the session
|
||||
time.AfterFunc(1*time.Minute, func() {
|
||||
for _, i := range s.Instances {
|
||||
if err := DeleteContainer(i.Name); err != nil {
|
||||
log.Println(err)
|
||||
}
|
||||
}
|
||||
DeleteNetwork(s.Id)
|
||||
})
|
||||
|
||||
if err := CreateNetwork(s.Id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user