From 22afaa628f319c852c536824cdd18444ddf87665 Mon Sep 17 00:00:00 2001 From: Prasanna Gautam Date: Sun, 9 Nov 2014 10:16:47 -0500 Subject: [PATCH 1/4] Additional info for docker binary Signed-off-by: Prasanna Gautam I found that certain docker installations do not handle binding to the source directory quite right. Just writing it based on help from backjlack and tibor in IRC. --- docs/sources/contributing/devenvironment.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/sources/contributing/devenvironment.md b/docs/sources/contributing/devenvironment.md index ee120a79c8..a5c2cc3057 100644 --- a/docs/sources/contributing/devenvironment.md +++ b/docs/sources/contributing/devenvironment.md @@ -63,7 +63,11 @@ To create the Docker binary, run this command: $ sudo make binary -This will create the Docker binary in `./bundles/-dev/binary/` +This will create the Docker binary in `./bundles/-dev/binary/`. If you do not see files in the `./bundles` directory in your host, your BINDDIR setting is not set quite right. You want to run the following command: + + $ sudo make BINDDIR=. binary + +If you are not in Linux - for example: OSX, you want to run `make cross` or `make BINDDIR=. cross`. ### Using your built Docker binary From 3600bcb53127c7d9f67d639c1f4e61c460b1d605 Mon Sep 17 00:00:00 2001 From: "gautam, prasanna" Date: Sun, 9 Nov 2014 19:52:38 -0500 Subject: [PATCH 2/4] limiting to 80 chars Signed-off-by: Prasanna Gautam < prasannagautam@gmail.com > --- docs/sources/contributing/devenvironment.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/sources/contributing/devenvironment.md b/docs/sources/contributing/devenvironment.md index a5c2cc3057..0f6f5f4bc1 100644 --- a/docs/sources/contributing/devenvironment.md +++ b/docs/sources/contributing/devenvironment.md @@ -63,7 +63,8 @@ To create the Docker binary, run this command: $ sudo make binary -This will create the Docker binary in `./bundles/-dev/binary/`. If you do not see files in the `./bundles` directory in your host, your BINDDIR setting is not set quite right. You want to run the following command: +This will create the Docker binary in `./bundles/-dev/binary/`. If you do not see files in the `./bundles` directory in your host, +your `BINDDIR` setting is not set quite right. You want to run the following command: $ sudo make BINDDIR=. binary From cf19df4683f416e4d536e772dc1ff02334794264 Mon Sep 17 00:00:00 2001 From: "gautam, prasanna" Date: Mon, 10 Nov 2014 18:04:23 -0500 Subject: [PATCH 3/4] fixing punctuation and grammar Signed-off-by: Prasanna Gautam --- docs/sources/contributing/devenvironment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/contributing/devenvironment.md b/docs/sources/contributing/devenvironment.md index 0f6f5f4bc1..70eafbbde4 100644 --- a/docs/sources/contributing/devenvironment.md +++ b/docs/sources/contributing/devenvironment.md @@ -68,7 +68,7 @@ your `BINDDIR` setting is not set quite right. You want to run the following com $ sudo make BINDDIR=. binary -If you are not in Linux - for example: OSX, you want to run `make cross` or `make BINDDIR=. cross`. +If you are on a non-Linux platform, e.g., OSX, you'll want to run `make cross` or `make BINDDIR=. cross`. ### Using your built Docker binary From 48424df68539965fec3056f4c349383948890896 Mon Sep 17 00:00:00 2001 From: Prasanna Gautam Date: Mon, 10 Nov 2014 20:05:35 -0500 Subject: [PATCH 4/4] properly line wrapping Signed-off-by: Prasanna Gautam --- docs/sources/contributing/devenvironment.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/sources/contributing/devenvironment.md b/docs/sources/contributing/devenvironment.md index 70eafbbde4..f39dec6708 100644 --- a/docs/sources/contributing/devenvironment.md +++ b/docs/sources/contributing/devenvironment.md @@ -63,12 +63,14 @@ To create the Docker binary, run this command: $ sudo make binary -This will create the Docker binary in `./bundles/-dev/binary/`. If you do not see files in the `./bundles` directory in your host, -your `BINDDIR` setting is not set quite right. You want to run the following command: +This will create the Docker binary in `./bundles/-dev/binary/`. If you +do not see files in the `./bundles` directory in your host, your `BINDDIR` +setting is not set quite right. You want to run the following command: $ sudo make BINDDIR=. binary -If you are on a non-Linux platform, e.g., OSX, you'll want to run `make cross` or `make BINDDIR=. cross`. +If you are on a non-Linux platform, e.g., OSX, you'll want to run `make cross` +or `make BINDDIR=. cross`. ### Using your built Docker binary