Merge pull request #4 from alexellis/ulimit_experimental

Experimental ulimit implementation and README.md

services/docker.go

@@ -29,10 +29,14 @@ func GetContainerInfo(id string) (types.ContainerJSON, error) {
 }
 
 func CreateNetwork(name string) error {
+	// TODO: This line appears to give an error when running on localhost:3000
+	// when driver is specified a name must be given.
 	opts := types.NetworkCreate{Attachable: true, Driver: "overlay"}
 	_, err := c.NetworkCreate(context.Background(), name, opts)
 
 	if err != nil {
+		log.Printf("Starting session err [%s]\n", err)
+
 		return err
 	}
 
@@ -70,10 +74,14 @@ func AttachExecConnection(execId string, ctx context.Context) (*types.HijackedRe
 	return &conn, nil
 }
 
-func CreateInstance(net string) (*ptypes.Instance, error) {
+func CreateInstance(net string, dindImage string) (*ptypes.Instance, error) {
 
+	var maximumPidLimit int64
+	maximumPidLimit = 150 // Set a ulimit value to prevent misuse
 	h := &container.HostConfig{NetworkMode: container.NetworkMode(net), Privileged: true}
-	conf := &container.Config{Image: "docker:dind"}
+	h.Resources.PidsLimit = maximumPidLimit
+
+	conf := &container.Config{Image: dindImage}
 	container, err := c.ContainerCreate(context.Background(), conf, h, nil, "")
 
 	if err != nil {

services/instance.go

@@ -1,19 +1,37 @@
 package services
 
-import "github.com/franela/play-with-docker/types"
+import (
+	"log"
+	"os"
+
+	"github.com/franela/play-with-docker/types"
+)
 
 var instances map[string]map[string]*types.Instance
 
+var dindImage string
+var defaultDindImageName string
+
 func init() {
 	instances = make(map[string]map[string]*types.Instance)
+        dindImage = getDindImageName()
+}
+
+func getDindImageName() string {
+	dindImage := os.Getenv("DIND_IMAGE")
+        defaultDindImageName = "docker:1.12.2-rc2-dind"
+        if len(dindImage) == 0 {
+		dindImage = defaultDindImageName
+	}
+	return dindImage
 }
 
 func NewInstance(session *types.Session) (*types.Instance, error) {
-	//TODO: Validate that a session can only have 10 instances
 
+	//TODO: Validate that a session can only have 5 instances
 	//TODO: Create in redis
-
-	instance, err := CreateInstance(session.Id)
+	log.Printf("NewInstance - using image: [%s]\n", dindImage)
+	instance, err := CreateInstance(session.Id, dindImage)
 
 	if err != nil {
 		return nil, err

services/session.go

@@ -18,6 +18,7 @@ func NewSession() (*types.Session, error) {
 	s := &types.Session{}
 	s.Id = uuid.NewV4().String()
 	s.Instances = map[string]*types.Instance{}
+	log.Printf("NewSession id=[%s]\n", s.Id)
 
 	//TODO: Store in something like redis
 	sessions[s.Id] = s