Docker for mac

README.md

@@ -12,30 +12,7 @@
 
 #### 1.2 OS X
 
-##### 1.2.1 An existing Docker host somewhere
-
-Advanced usage! If you've got a Docker instance running somewhere already, for instance another server, you need to set these environment variables:
-
-    export DOCKER_CERT_PATH=$HOME/path/to/docker/certs
-    export DOCKER_HOST=tcp://192.168.1.79:2376
-    export DOCKER_TLS_VERIFY=1
-
-Change as needed. The files required in the certs dir are:
-
-* ca.pem: The ca certificate
-* cert.pem: The client certificate
-* key.pem: The client key
-
-For simpler usage see section 1.2.2, "Run Docker locally using a VM"
-
-##### 1.2.2 Run Docker locally using a VM
-
-On [this page](http://docs.docker.io/installation/mac/) follow these tasks:
-
- * Installing VirtualBox
- * Installing docker-machine using HomeBrew
-
-Next, [create and start a docker-machine image](https://docs.docker.com/machine/get-started/)
+Follow [this page](https://docs.docker.com/engine/installation/mac/) to install Docker for mac.
 
 You can now run docker commands locally on your mac.
 

build_ruby.go

@@ -9,7 +9,6 @@ import (
 	"github.com/urfave/cli"
 	"github.com/wsxiaoys/terminal/color"
 	"io"
-	"net/url"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -45,25 +44,13 @@ var (
 const image_tag string = "ruby_build"
 
 func init() {
-	u, err := url.Parse(os.Getenv("DOCKER_HOST"))
+	endpoint := "unix:///var/run/docker.sock"
+	client, err := docker.NewClient(endpoint)
 	if err != nil {
 		panic(err)
 	}
-	u.Scheme = "https"
-	docker_endpoint = u.String()
 
-	c, err := docker.NewClient(docker_endpoint)
-
-	tr, err := NewHTTPSClient(os.Getenv("DOCKER_CERT_PATH"))
-	if err != nil {
-		panic(err)
-	}
-	c.HTTPClient = tr
-
-	if err != nil {
-		panic(err)
-	}
-	docker_client = c
+	docker_client = client
 }
 
 func main() {
@@ -260,9 +247,8 @@ func copyPackageFromContainerToLocalFs(container *docker.Container, filename str
 	color.Println("@{g!}Copying package out of the container")
 
 	var buf bytes.Buffer
-	if err := docker_client.CopyFromContainer(docker.CopyFromContainerOptions{
-		Container:    container.ID,
-		Resource:     filename,
+	if err := docker_client.DownloadFromContainer(container.ID, docker.DownloadFromContainerOptions{
+		Path:         filename,
 		OutputStream: &buf,
 	}); err != nil {
 		panic(err)