Commit Graph
41886 Commits
Author SHA1 Message Date
GordonTheTurtle 1551262dc8 Merge component 'engine' from git@github.com:docker/engine master 2018-08-17 21:02:05 +00:00
Yong Tang 851fdda625 Merge pull request #37563 from Microsoft/jjh/fix-vso17531561v2
LCOW: Ensure platform is populated on COPY/ADD
Upstream-commit: 14d5569f1942d22e364dc4844198b58e702299fc
Component: engine
2018-08-17 12:51:17 -07:00
John Stephens 98e7273292 Merge pull request #35521 from salah-khan/35507
Add --chown flag support for ADD/COPY commands for Windows
Upstream-commit: b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5
Component: engine
2018-08-17 11:31:16 -07:00
Sebastiaan van Stijn f8aa818e3b Merge pull request #37613 from tiborvass/buildkit-pull
builder: implement PullParent option with buildkit
Upstream-commit: ba5c92f1bf78d884bcca1b8a4443bdf0f09fb0e6
Component: engine
2018-08-17 18:17:06 +01:00
GordonTheTurtle 6fd88edfc3 Merge component 'cli' from git@github.com:docker/cli master 2018-08-17 16:36:57 +00:00
Sebastiaan van Stijn 8c8e199673 Merge pull request #1288 from tiborvass/build-secrets
Build --secret with buildkit
Upstream-commit: cb142fa49f
Component: cli
2018-08-17 17:20:32 +01:00
Tibor Vass fefaefabba vendor: Bump default API version to 1.39
vendors github.com/docker/docker to a7ff19d69a90dfe152abd146221c8b9b46a0903d

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b4057f0293
Component: cli
2018-08-17 15:52:11 +00:00
Tibor Vass a75ae7bafa build: implement build secrets with buildkit
This patch implements `docker build --secret id=mysecret,src=/secret/file`
for buildkit frontends that request the mysecret secret.

It is currently implemented in the tonistiigi/dockerfile:secrets20180808
frontend via RUN --mount=type=secret,id=mysecret

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c4c4825591
Component: cli
2018-08-17 14:01:32 +00:00
GordonTheTurtle 084c64a455 Merge component 'engine' from git@github.com:docker/engine master 2018-08-17 13:03:18 +00:00
Vincent Demeester b6f5424fe0 Merge pull request #37660 from andrewhsu/go-con
vndr go-connections to v0.4.0
Upstream-commit: a7ff19d69a90dfe152abd146221c8b9b46a0903d
Component: engine
2018-08-17 10:58:01 +02:00
Tibor Vass fbda033233 builder: implement PullParent option with buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7c1c8f1fe29c28ef62017d99a99eb1ec6be4513c
Component: engine
2018-08-17 08:40:58 +00:00
GordonTheTurtle acb98b01dc Merge component 'engine' from git@github.com:docker/engine master 2018-08-17 01:02:58 +00:00
Andrew Hsu dfe2d66f01 vndr go-connections to v0.4.0
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 626c097f8c29bf432e5465a961496bf41aa74cad
Component: engine
2018-08-16 23:46:53 +00:00
Yong Tang c60644846d Merge pull request #37657 from thaJeztah/bump_api_v1.39
Swagger: bump API version to v1.39
Upstream-commit: b6242da4ee29d7692dec32a5e00fd50b7c886d75
Component: engine
2018-08-16 15:51:52 -07:00
GordonTheTurtle 564cbe9f35 Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 21:00:55 +00:00
GordonTheTurtle 05cae6be4e Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 17:02:54 +00:00
Sebastiaan van Stijn 9dae42985b Merge pull request #37149 from dmcgowan/split-libcontainerd
libcontainerd: split client and daemon supervision
Upstream-commit: 4d6219264655bbb4510642e40d7914fd56962596
Component: engine
2018-08-16 19:00:10 +02:00
Sebastiaan van Stijn 088a8059a2 Swagger: bump API version to v1.39
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 871894e95e62be58a2b7e6037590e0235072f1bb
Component: engine
2018-08-16 16:24:48 +02:00
Sebastiaan van Stijn adf79edc07 Merge pull request #37472 from thaJeztah/no_unknown
Do not return "<unknown>" in /info response
Upstream-commit: 0a4f89566a22a07427d850a8d70f264210062da0
Component: engine
2018-08-16 14:56:31 +02:00
GordonTheTurtle a635bc1d4a Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 09:01:01 +00:00
Vincent Demeester 3baa6424ff Merge pull request #37592 from kolyshkin/no-go-version-env
hack/make.ps1: don't rely on GO_VERSION
Upstream-commit: b1ba744a24d09dc853aef970985fa03452084e06
Component: engine
2018-08-16 09:22:55 +02:00
GordonTheTurtle 9f84af0b04 Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 05:01:14 +00:00
GordonTheTurtle dddebc37ad Merge component 'cli' from git@github.com:docker/cli master 2018-08-16 04:36:35 +00:00
Tibor Vass aecdb056f0 Merge pull request #1276 from tiborvass/buildkit-progress-flag
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
Upstream-commit: 964173997d
Component: cli
2018-08-15 20:42:47 -07:00
Akihiro Suda 2418c55ad0 Merge pull request #37597 from tiborvass/fix-cancel-bug
builder: do not cancel buildkit status request
Upstream-commit: 080c27dd1374d9be2e3e53bcffe62d7bb3ec0a3b
Component: engine
2018-08-16 12:42:35 +09:00
GordonTheTurtle 3606edfdc9 Merge component 'engine' from git@github.com:docker/engine master 2018-08-16 01:01:30 +00:00
Yong Tang 588ae61588 Merge pull request #37600 from edrevo/conemu-fix
Fix #28814: use emulation for ConEmu and ConsoleZ
Upstream-commit: 74c43af1a3ba70a044971679c91c283ecf2b34df
Component: engine
2018-08-15 16:50:05 -07:00
GordonTheTurtle bc6836aa1b Merge component 'engine' from git@github.com:docker/engine master 2018-08-15 21:02:36 +00:00
Tibor Vass b8b3a2fa72 Merge pull request #37640 from dhiltgen/bump_api_version
Bump API version to 1.39
Upstream-commit: bf3d6a50137d1b7ded440634cec65f894f952a29
Component: engine
2018-08-15 11:57:04 -07:00
Kir Kolyshkin 6a77a79235 hack/make.ps1: don't use ENV GO_VERSION
Modify hack/make.ps1 to use the version value used in
"FROM golang" statement.

While at it:
 1. Make search expression a bit more strict (use ^ to match at BOL only).
 2. Simplify by removing Get-Contents as Select-String can read files.

After this, ENV GO_VERSION can be removed from Dockerfile.
Unfortunately it can't be done in one commit as Windows CI
fails (presumably because Dockerfile is being modified in
place).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 6a2851332d5f86bb61a69d277f663f369377037b
Component: engine
2018-08-15 12:16:39 +03:00
GordonTheTurtle c114e9c465 Merge component 'cli' from git@github.com:docker/cli master 2018-08-15 00:07:01 +00:00
Daniel Hiltgen 0b9441c0bb Bump API version to 1.39
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e05b657120a665a54715d3999cd18ae9a3f8d711
Component: engine
2018-08-15 00:01:30 +00:00
Brian Goff a46d6924fa Merge pull request #1014 from AkihiroSuda/connhelper-sshonly
support SSH connection
Upstream-commit: e92614a175
Component: cli
2018-08-14 15:12:06 -07:00
GordonTheTurtle 2b0a9fe44a Merge component 'cli' from git@github.com:docker/cli master 2018-08-14 20:36:50 +00:00
GordonTheTurtle e37773a24d Merge component 'engine' from git@github.com:docker/engine master 2018-08-14 17:02:40 +00:00
Sebastiaan van Stijn d8d0aaab1d Merge pull request #1284 from adshmh/refactor-stack-ps-tests
refactor stack ps tests 
Upstream-commit: 4d4392ba04
Component: cli
2018-08-14 18:59:56 +02:00
Sebastiaan van Stijn 1eafd46aad Merge pull request #37412 from AzureCR/naduggar/logissue
Select polling based watcher for docker log file watcher on Windows
Upstream-commit: 678d4b3a6d4cd7824d26592090b4dec507ce4bc2
Component: engine
2018-08-14 14:40:44 +02:00
Sebastiaan van Stijn 0de052caee Merge pull request #37635 from kolyshkin/test-logs
integration-cli: error logging improvements
Upstream-commit: 3c5eac362884bb60f9c7778966559d04b44cfb6a
Component: engine
2018-08-14 14:38:34 +02:00
Kir Kolyshkin 0b5da3a767 integration-cli: error report improvements
1. After running d.Cmd(), in case an error is returned, it makes sense
to print command output, as its stderr may contain a clue about what
went wrong. This is by no means complete, just as far as I could go.

2. In case the comment in c.Assert is a constant string, it's better
to provide it as a comment which will be printed.

3. An arbitrary string should not be passed on to a function expecting
%-style formatting. Use %s to fix this.

4. Print the output string before transformation, not after.

5. Unify the output format (drop "out:" prefix").

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: ac038eab298eeecab55a62440de302e3bb3f4889
Component: engine
2018-08-14 12:52:30 +03:00
Kir Kolyshkin fe821da2fd integration: use %s for check.Commentf()
It is wrong to pass an arbitrary string to a function expecting
%-style formatting. One solution would be to replace any % with %%,
but it's easier to just do what this patch does.

Generated with:

for f in $(git grep -l 'check.Commentf(out)'); do \
	sed -i -e 's/check\.Commentf(out)/check.Commentf("%s", out)/g' $f; \
done

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 83363fb2d4d97d952a0052d079faa8ae39aa20b6
Component: engine
2018-08-14 10:45:39 +03:00
Salahuddin Khan 7414934b6c Add ADD/COPY --chown flag support to Windows
This implements chown support on Windows. Built-in accounts as well
as accounts included in the SAM database of the container are supported.

NOTE: IDPair is now named Identity and IDMappings is now named
IdentityMapping.

The following are valid examples:
ADD --chown=Guest . <some directory>
COPY --chown=Administrator . <some directory>
COPY --chown=Guests . <some directory>
COPY --chown=ContainerUser . <some directory>

On Windows an owner is only granted the permission to read the security
descriptor and read/write the discretionary access control list. This
fix also grants read/write and execute permissions to the owner.

Signed-off-by: Salahuddin Khan <salah@docker.com>
Upstream-commit: 763d8392612942ff5c32a35f8bdafd7ae93d3321
Component: engine
2018-08-13 21:59:11 -07:00
GordonTheTurtle b04c87dc5b Merge component 'engine' from git@github.com:docker/engine master 2018-08-13 05:01:54 +00:00
Yong Tang 96af87df0a Merge pull request #37443 from Projjol/new_names
Add in two new names for names-generator
Upstream-commit: 1fd7e4c28d3a4a21c3540f03a045f96a4190b527
Component: engine
2018-08-12 19:04:56 -07:00
Arash Deshmeh 0b69793ee3 refactor stack ps tests to table-driven
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 340e4ee8e5
Component: cli
2018-08-10 15:13:45 -04:00
Tibor Vass 16b520e100 builder: do not cancel buildkit status request
This fixes a bug when the build results in an error and instead of sending
the logs of the container to the client, it signals a cancelation.

The context should not be wired to the status request, as only the
build requests need to be canceled.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f1ef16c736b477be17f6bc1bce18d0958a87d840
Component: engine
2018-08-10 17:29:32 +00:00
GordonTheTurtle af7228d929 Merge component 'cli' from git@github.com:docker/cli master 2018-08-10 12:36:59 +00:00
Silvin 70a91dd01b Merge pull request #1283 from adshmh/refactor-trust-revoke-tests
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
Component: cli
2018-08-10 11:03:58 +02:00
Vincent Demeester e3e25812ec Merge pull request #1280 from adshmh/refactor-trust-inspect-tests
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
Component: cli
2018-08-10 10:37:53 +02:00
Arash Deshmeh ea09ac3378 refactored trust revoke command unit tests to use table-driven style
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 984d76b9dd
Component: cli
2018-08-09 15:58:54 -04:00
GordonTheTurtle f68f53a53c Merge component 'cli' from git@github.com:docker/cli master 2018-08-09 16:36:51 +00:00