Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,642 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

32 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 4fe6b837b7
bump gotest.tools v3.0.1 for compatibility with Go 1.14 
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2c0e93063b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-21 16:43:18 +02:00
Sam 5761759e43
fix formatting issue of encoded url 
Signed-off-by: Sam <samashah@microsoft.com>
(cherry picked from commit ee76ac8f93)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-17 13:48:54 +01:00
Sebastiaan van Stijn b083f625e4
cli: remove unnecessary newlines (whitespace) 
```
cli/config/config_test.go:465: unnecessary trailing newline (whitespace)

}
cli/compose/interpolation/interpolation.go:56: unnecessary leading newline (whitespace)
	switch value := value.(type) {

cli/compose/interpolation/interpolation.go:94: unnecessary trailing newline (whitespace)

	}
cli/command/image/build/context.go:348: unnecessary trailing newline (whitespace)

		}
internal/licenseutils/client_test.go:98: unnecessary leading newline (whitespace)
func (c *fakeLicensingClient) LoadLocalLicense(ctx context.Context, dclnt licensing.WrappedDockerClient) (*model.Subscription, error) {

cli/registry/client/fetcher.go:211: unnecessary leading newline (whitespace)
	for _, endpoint := range endpoints {
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 612d83d6df)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-06 13:16:57 +01:00
Sebastiaan van Stijn acec6cb56f
cli/command/image/build: G107: Potential HTTP request made with variable url (gosec) 
cli/command/image/build/context.go:235: G107: Potential HTTP request made with variable url (gosec)
    	if resp, err = http.Get(url); err != nil {

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e4bd30cfe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-06 13:16:47 +01:00
Silvin Lubecki 98d2661522
cli/command/image/build/context_test.go:244:38: `createTestTempDir` - `prefix` always receives `"builder-context-test"` (unparam) 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit b83545ebbc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-06 13:16:44 +01:00
Silvin Lubecki 9c7b701de5
cli/command/image/build/context_test.go:252:71: `createTestTempFile` - `perm` always receives `0777` (`511`) (unparam) 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 0ce2eae5a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-06 13:16:35 +01:00
Silvin Lubecki 6f91e46b7b
cli/command/image/build/context_test.go:244:38: `createTestTempDir` - `dir` always receives `""` (unparam) 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 70bd64d037)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-01-06 13:16:35 +01:00
Nao YONASHIRO 446762dc19 test: add filepathMatches test 
Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
 2019-03-28 01:22:11 +09:00
Nao YONASHIRO b41ddc6058 feat: improves ValidateContextDirectory performance 
Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
 2019-03-28 01:20:42 +09:00
Lifubang 06e250d37b add test case for DetectArchiveReader 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
 2019-03-21 15:38:31 -07:00
Kir Kolyshkin 0c20554f69 image build: fix archive detection 
As pointed out in #1459, docker cli fails to detect that the input is a tarball,
in case it is generated by `git archive --format=tgz`.

This happens because `git archive` adds some metadata to the initial tar header,
and so it is more than 1 block (of 512 bytes) long, while we only provide 1 block
to archive/tar.Next() and it fails.

To fix, give it 2 blocks :)

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2019-03-21 15:38:07 -07:00
Andrew Hsu 2daec78609
Merge pull request #1111 from tiborvass/experimental-buildkit 
Support for experimental BuildKit
 2018-06-13 18:21:41 -07:00
Tibor Vass b3a5c153d5 build: address some review nits 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 22:40:31 +00:00
Tibor Vass 00792d1704 build: ensure temporary folder is removed in error case 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:29 +00:00
Tibor Vass 5919e8a30f build: fix lint issues + refactor 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +00:00
Tibor Vass 15674d9ee9 build: simplify Close logic in WriteTempDockerfile 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +00:00
Tibor Vass e0b3921a03 build: Add support for using context from stdin with buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-09 20:51:34 +00:00
Vincent Demeester 2c4de4fb5e
Update tests to use gotest.tools 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 18:24:26 +02:00
Justyn Temme c2a35cfa1a Change error message for unreadable files 
Fix for https://github.com/docker/for-linux/issues/44

Signed-off-by: Justyn Temme <justyntemme@gmail.com>
 2018-05-11 13:03:19 -05:00
Daniel Nephin 681c921528 Remove testutil 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 14:38:35 -05:00
Daniel Nephin 39c2ca57c1 Automated migration 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Sebastiaan van Stijn a1048523d2
Allow Dockerfile from outside build-context 
Historically, the Dockerfile had to be insde the build-context, because it was
sent as part of the build-context.

3f6dc81e10
added support for passing the Dockerfile through stdin, in which case the
contents of the Dockerfile is injected into the build-context.

This patch uses the same mechanism for situations where the location of the
Dockerfile is passed, and its path is outside of the build-context.

Before this change:

    $ mkdir -p myproject/context myproject/dockerfiles && cd myproject
    $ echo "hello" > context/hello
    $ echo -e "FROM busybox\nCOPY /hello /\nRUN cat /hello" > dockerfiles/Dockerfile
    $ docker build --no-cache -f $PWD/dockerfiles/Dockerfile $PWD/context

    unable to prepare context: the Dockerfile (/Users/sebastiaan/projects/test/dockerfile-outside/myproject/dockerfiles/Dockerfile) must be within the build context

After this change:

    $ mkdir -p myproject/context myproject/dockerfiles && cd myproject
    $ echo "hello" > context/hello
    $ echo -e "FROM busybox\nCOPY /hello /\nRUN cat /hello" > dockerfiles/Dockerfile
    $ docker build --no-cache -f $PWD/dockerfiles/Dockerfile $PWD/context

    Sending build context to Docker daemon  2.607kB
    Step 1/3 : FROM busybox
     ---> 6ad733544a63
    Step 2/3 : COPY /hello /
     ---> 9a5ae1c7be9e
    Step 3/3 : RUN cat /hello
     ---> Running in 20dfef2d180f
    hello
    Removing intermediate container 20dfef2d180f
     ---> ce1748f91bb2
    Successfully built ce1748f91bb2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-20 16:50:49 +01:00
Daniel Nephin 846a31aa50 Use new internal testutil.ErrorContains() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:14:25 -04:00
Daniel Nephin a04aa8fe28 Compress after rewriting the archive. 
Write a test showing compress failure.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-29 13:18:10 -04:00
Daniel Nephin 0310de5213 Move IsArchive and HeaderSize to build/context 
Previously these were in docker/docker/pkg/archive, but unused

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-08 16:08:11 -04:00
Vincent Demeester 44ac80881f
Update vendoring of docker/docker 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-06 00:23:21 +02:00
Daniel Nephin 779012af69 Refacator pkg/streamformatter 
StreamFormatter suffered was two distinct structs mixed into a single struct
without any overlap.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-03 18:49:14 -07:00
Daniel Nephin 36a7842089 Fix goimports failure on master. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-03 15:58:39 -04:00
Daniel Nephin a5044b4982 Move addDockerfileToBuildContext to the build package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-28 15:11:36 -04:00
Daniel Nephin b98e03d3b0 Extract dockerfile handling functions. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-28 15:11:36 -04:00
Daniel Nephin 59983759c2 Cleanup handling of the - for stdin 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-28 15:11:36 -04:00
Daniel Nephin 1630fc40f8 Import docker/docker/cli 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-04-17 17:40:59 -04:00