Fix ns-enter stdin

marmelab · Jul 22, 2014 · 31c1a09 · 31c1a09
1 parent 6115cab
commit 31c1a09
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
-    - 1.2
+    - 1.2.1
 
 script:
     - go get code.google.com/p/go.tools/cmd/goimports

diff --git a/docker/docker.go b/docker/docker.go
@@ -221,7 +221,7 @@ func Enter(name string) {
 
 	util.Debug("Run command:", enterCmd.Args)
 
-	if err := enterCmd.Start(); err != nil {
+	if err := enterCmd.Run(); err != nil {
 		util.LogError(err)
 	}
 }

diff --git a/examples/ns-enter/.gaudi.yml b/examples/ns-enter/.gaudi.yml
@@ -12,16 +12,10 @@ applications:
         ports:
             11211: 11211
 
-#    redis:
-#        type: remote
-#        image: gary/redis
-#        path: github.com/manuquentin/docker-redis
-#        ports:
-#            6379: 6379
-
+    redis:
+        type: github
+        image: gary/redis
+        path: github.com/manuquentin/docker-redis
+        ports:
+            6379: 6379
 
-#    redis2:
-#        type: custom
-#        template: ./redis/Dockerfile
-#        ports:
-#            6379: 6379
diff --git a/gaudi/gaudi.go b/gaudi/gaudi.go
@@ -93,7 +93,7 @@ func (gaudi *Gaudi) Init(content string) {
 	}
 
 	if gaudi.useNewVersion() {
-//		os.RemoveAll(TEMPLATE_DIR)
+		os.RemoveAll(TEMPLATE_DIR)
 	}
 
 	// Check if templates are present