p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,459 Commits 1 Branch 0 Tags
249c8652a272d2031651f026e8c698094de5ecc9
Commit Graph

120 Commits

Author SHA1 Message Date
Silvin
f285fe67e9 Merge pull request #1163 from thaJeztah/bump_engine 
bump docker and dependencies
 2018-07-04 16:17:12 +02:00
Sebastiaan van Stijn
5f6d5c7328 Bump docker and dependencies 
Updates docker/docker to 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d,
matching 18.06.0-rc1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-04 01:14:40 +00:00
Tibor Vass
721000e6c9 build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0" 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-07-03 23:14:06 +00:00
Tibor Vass
c7e85c09d2 build: --iidfile support with buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-07-03 19:11:11 +00:00
Vincent Demeester
e43c7920ea Export Push and Save 
As we did for `Pull`, it will be helpful to expose the push and save
implementation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-14 15:48:21 +02: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
5a103e1844 build: change --no-console to --console=[true|false|auto] 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 21:07:11 +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
aef42093b8 build: skip moby.buildkit.trace Aux message to be future proof 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +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
ed75f6202b build: add experimental --no-console flag to support non-tty human-readable output with buildkit 
Unfortunately, this is for now the only way to see the output of RUN commands when using buildkit.
It is equivalent to `DOCKER_BUILDKIT=1 docker build . 2>&1 | cat`

Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +00:00
Tibor Vass
b2b3f9c461 build: setting DOCKER_BUILDKIT environment variable to any non-empty string enables the use of buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +00:00
Tibor Vass
640cbb8d2f build: fix output handling with buildkit (quiet option, redirects) 
With this patch the following become true even with buildkit enabled:
1. `docker build -q .` only outputs the created image's sha256 ID.
2. `docker build -q .` outputs as if no `-q` was specified, if error occurred
3. `docker build . &> out` outputs JSON (instead of TTY characters)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +00:00
Tibor Vass
82f0e1e5d8 build: fix -f handling with buildkit 
This commit brings a more pedantic change in the following ambiguous case:
cat Dockerfile | docker build -f otherDockerfile -

The legacy builder does not error out and prefers the Dockerfile from stdin
while the buildkit-based one errors out.

Note that this is only in the case where stdin is a Dockerfile (not an archive)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-13 18:32:28 +00:00
Silvin
4cb3c70f36 Merge pull request #1121 from vdemeester/gotestyourself-with-tools 
Update gotestyourself to gotest.tools
 2018-06-11 14:49:20 +02:00
Tibor Vass
89e102474c build: error out if buildkit is on and stdin is used for both dockerfile and context 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-09 20:51:34 +00:00
Tibor Vass
5314a8fc06 build: Add support for using dockerfile from stdin with buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-06-09 20:51:34 +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
Tonis Tiigi
8cf213bd0c build: use a separate upload request for early progress 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-09 20:51:34 +00:00
Tonis Tiigi
0f97642915 build: basic buildkit progress support 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-09 20:51:34 +00:00
Tonis Tiigi
656fe85c74 build: add experimental buildkit base 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-09 20:51:30 +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
Vincent Demeester
b1065767cd Bump moby version (and its dependencies) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 11:26:10 +02:00
Vincent Demeester
8b3dc39fce Fix panics when --compress and --stream are used together 
Warns that `-compress` has no effect when used together with the
expremintal `--stream` flag.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-01 18:34:00 +02:00
Zachary Romero
b6cf6d87ae Add String method so quieted output displays properly 
Fixes #1089

Signed-off-by: Zachary Romero <zacromero3@gmail.com>
 2018-05-29 05:30:17 +03:00
Sebastiaan van Stijn
9a89c32e9a Merge pull request #1053 from justyntemme/patch-3 
Change error message for unreadable files
 2018-05-22 00:12:46 +02:00
Mathieu Champlon
5d54584f03 Bump moby to d37f5c6bdf788a6cb82c07fb707e31a240eff5f9 
Also bringing:
. golang.org/x/net 5561cd9b4330353950f399814f427425c0a26fd2
. github.com/docker/distribution 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
. github.com/docker/swarmkit bd69f6e8e301645afd344913fa1ede53a0a111fb
. github.com/docker/go-metrics d466d4f6fd960e01820085bd7e1a24426ee7ef18
. github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e
. github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
. github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
. github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
. github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
. github.com/matttproud/golang_protobuf_extensions v1.0.0

Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2018-05-18 11:44:14 +02:00
Kir Kolyshkin
6f8070deb2 Switch from x/net/context to context 
Since go 1.7, "context" is a standard package. Since go 1.9,
x/net/context merely provides some types aliased to those in
the standard context package.

The changes were performed by the following script:

for f in $(git ls-files \*.go | grep -v ^vendor/); do
	sed -i 's|golang.org/x/net/context|context|' $f
	goimports -w $f
	for i in 1 2; do
		awk '/^$/ {e=1; next;}
			/\t"context"$/ {e=0;}
			{if (e) {print ""; e=0}; print;}' < $f > $f.new && \
				mv $f.new $f
		goimports -w $f
	done
done

[v2: do awk/goimports fixup twice]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-05-11 16:49:43 -07: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 Hiltgen
812f113685 Export pull as a public function 
It will be helpful to expose the pull implementation which supports
pulling private images for other CLI commands that rely on helper images.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2018-04-27 12:21:19 -07:00
Tonis Tiigi
a1cbaa827b vendor: update moby to ed7b6428 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-03-27 14:11:29 -07:00
Daniel Nephin
0f1bb35342 Refactor build tests to re-use more code and not require root 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-26 14:27:52 -04:00
Sebastiaan van Stijn
c0ffb9491c Merge pull request #924 from vdemeester/trust-suite-tests 
Add some content trust tests
 2018-03-19 11:24:00 +01:00
Vincent Demeester
8b00c5cfd8 Add more content trust tests 
Importing from moby's DockerTrustSuite tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-19 10:02:40 +01:00
Vincent Demeester
63ebcae382 Small content trust enhancement 
- `replaceDockerfileForContentTrust` is only used when content trust is
  enabled, so remove the boolean.
- rename `isContentTrustEnabled` to `contentTrustEnabled`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-14 17:55:19 +01:00
Daniel Nephin
feae0e9756 Only read trust setting from options 
Rename IsTrusted to ContentTrustEnabled

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-08 16:46:30 -05:00
Vincent Demeester
6e21829af4 Refactor content_trust cli/flags handling 
Remove the global variable used. Allows easier unit testing.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-08 15:00:43 -05:00
Sebastiaan van Stijn
82f325ed81 Merge pull request #925 from dnephin/add-build-test-symlink 
Add a build unit test for symlinked context
 2018-03-08 18:52:43 +01:00
Daniel Nephin
00b803b2d8 Add a build unit test for symlinked context 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-07 13:04:33 -05:00
Vincent Demeester
0cf2e6353a Fixes some unit tests to be able to run them on windows 
Some of them are skipped for now (because the feature is not supported
or needs more work), some of them are fixed.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-03-07 18:18:13 +01:00
Daniel Nephin
e15b208e96 Convert assert.Check(t, is.Error()) to assert.Error 
git grep -l -P '^\s+assert\.Check\(t, is\.Error\(' | \
    xargs perl -pi -e 's/^(\s+assert\.)Check\(t, is\.Error\((.*)\)$/\1Error(t, \2/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 16:00:28 -05:00
Daniel Nephin
078cbc9c4b Convert assert.Check with 
git grep -l -P '^\s+assert\.Check\(t, ' | \
    xargs perl -pi -e 's/^(\s+assert)\.Check(\(t, (?!is).*(\.Execute\(|\.Set\(|\.Write\(|\.Close\(|\.Untar\(|\.WriteFile\(|Validate\().*\)$)/\1.NilError\2/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:43:53 -05:00
Daniel Nephin
baf65a5502 Convert to assert.NilError 
Using:

  git grep -l '^\s\+assert\.Check(t, err)$' | \
    xargs sed -i -e 's/^\(\s\+assert\)\.Check(t, err)$/\1.NilError(t, err)/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:27:34 -05:00
Daniel Nephin
0f11a310fd dont prompt for github creds in unit test 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:27:09 -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
5155cda716 Post migration fixes 
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Daniel Nephin
39c2ca57c1 Automated migration 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Daniel Nephin
93615dd967 Update some assertions. 
and fix some tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 17:15:24 -05:00