diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 4f5d3c1a37..5d34beca76 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -344,6 +344,13 @@ $ docker build -f Dockerfile.debug . This will use a file called `Dockerfile.debug` for the build instructions instead of `Dockerfile`. +```bash +$ curl example.com/remote/Dockerfile | docker build -f - . +``` + +The above command will use the current directory as the build context and read +a Dockerfile from stdin. + ```bash $ docker build -f dockerfiles/Dockerfile.debug -t myapp_debug . $ docker build -f dockerfiles/Dockerfile.prod -t myapp_prod . diff --git a/pkg/archive/archive_test.go b/pkg/archive/archive_test.go index b9f8c65f5d..481369da73 100644 --- a/pkg/archive/archive_test.go +++ b/pkg/archive/archive_test.go @@ -4,7 +4,6 @@ import ( "archive/tar" "bytes" "fmt" - "github.com/docker/docker/pkg/testutil/assert" "io" "io/ioutil" "os" @@ -14,6 +13,8 @@ import ( "strings" "testing" "time" + + "github.com/docker/docker/pkg/testutil/assert" ) var tmp string