dc90119f4b
Merge pull request #37659 from Microsoft/jjh/37356
...
LCOW: Mount to short container paths to avoid command-line length limit
Upstream-commit: 8613b34a7e363948555eb986fd6078d9f9c808d7
Component: engine
2018-08-17 15:48:35 -07:00
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
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
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
2db873cf38
LCOW: Capture stderr on external process. Log actual error rather than throwaway
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dffc96616503936fc282c0e3a3eea8695ee11b67
Component: engine
2018-08-16 19:20:14 -07:00
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
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
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
b552588bbc
Merge pull request #37609 from seratch/fix-typos
...
Fix the several typos detected by github.com/client9/misspell
Upstream-commit: 4122eb1a43a42c4c8b827b4d0fb3d6543f9f2c91
Component: engine
2018-08-09 08:48:05 +09:00
71a3e53c36
Fix the several typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com >
Upstream-commit: 1e49fdcafc6601cd9dd5c46551ee283baa0272ef
Component: engine
2018-08-09 00:45:00 +09:00
a3a5617ab6
builder: fix compilation errors after vendoring
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c53d7e71046581775a8888706c0fd6baddb81a0b
Component: engine
2018-08-07 06:03:10 +00:00
3e57bf0941
LCOW: Ensure platform is populated on COPY/ADD
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ae6b5828ce0cee380267fb9060695bc3ae40e25b
Component: engine
2018-07-30 12:49:33 -07:00
1244bbdf28
Merge pull request #37439 from tiborvass/vendor-buildkit
...
Set BuildKit's ExportedProduct variable to show useful errors in the future
Upstream-commit: 9ebed53c5431a7c8296107869f1b3feabee9e8f3
Component: engine
2018-07-17 12:10:23 -07:00
3b5e16f319
validate: please vet
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 81599222fc8f8a845b68ca15f3582e76de24a7b3
Component: engine
2018-07-16 21:41:54 +00:00
adc3470981
vendor: buildkit to 98f1604134f945d48538ffca0e18662337b4a850
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0ab7c1c5bacdf8b18c66b729bb7f919f6acfcf29
Component: engine
2018-07-16 21:41:53 +00:00
3fa9808e55
Merge pull request #37396 from yui-knk/error_when_base_name_resolved_to_blank
...
Return error if basename is expanded to blank
Upstream-commit: 492545e139e7461aac044149a931bb4b2dd48f75
Component: engine
2018-07-15 15:42:57 -07:00
900616b995
Return error if basename is expanded to blank
...
Fix: https://github.com/moby/moby/issues/37325
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: c9542d313e2a52807644742e5fd684bc2de9f507
Component: engine
2018-07-15 22:29:03 +09:00
d799a9b46d
Fix golint issues
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 35f7e7c50a131494c9d530800e80bf2da42fb89c
Component: engine
2018-07-11 22:19:03 +02:00
6029eff9d1
Merge pull request #37413 from yui-knk/do_not_Healthcheck_RUN_command
...
Ensure RUN instruction to run without Healthcheck
Upstream-commit: f0585d04d079d289b7b9cb572f8ee509f6768402
Component: engine
2018-07-11 20:38:03 +02:00
4c7a4e64a3
builder: fix duplicate calls to mountable
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ffa7233d1538363fe12ad609e720b8d75e8768de
Component: engine
2018-07-10 15:21:29 -07:00
f4afbedc77
Ensure RUN instruction to run without Healthcheck
...
Before this commit Healthcheck run if HEALTHCHECK
instruction appears before RUN instruction.
By passing `withoutHealthcheck` to `copyRunConfig`,
always RUN instruction run without Healthcheck.
Fix: https://github.com/moby/moby/issues/37362
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 44e08d8a7d1249a1956018c6c3d3655642a4f273
Component: engine
2018-07-08 16:49:04 +09:00
cb25218045
Merge pull request #37380 from yui-knk/update_doc_Detect
...
Update documents of `Detect`
Upstream-commit: 8d56fa0bb780beb7b7116a8a17771179074408ea
Component: engine
2018-07-05 14:49:18 +02:00
6f30c64548
Merge pull request #37381 from tiborvass/api-platforms-as-string-for-temp
...
api: Change Platform field back to string (temporary workaround)
Upstream-commit: b711437bbd8596312c962d4189e9ad4d2108c2dc
Component: engine
2018-07-03 17:54:42 -07:00
32dfa10dbf
Merge pull request #37385 from tonistiigi/update-buildkit
...
vendor: update buildkit to 9acf51e491
Upstream-commit: 4b3df087a222fa34d771137b02348c51d9e107bc
Component: engine
2018-07-03 17:33:54 -07:00
6283fee6a2
api: Change Platform field back to string (temporary workaround)
...
This partially reverts https://github.com/moby/moby/pull/37350
Although specs.Platform is desirable in the API, there is more work
to be done on helper functions, namely containerd's platforms.Parse
that assumes the default platform of the Go runtime.
That prevents a client to use the recommended Parse function to
retrieve a specs.Platform object.
With this change, no parsing is expected from the client.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: facad557440a0c955beb615495b8d0175f25e4e3
Component: engine
2018-07-03 22:33:42 +00:00
1e9fc972c9
Merge pull request #37368 from tiborvass/buildkit-iidfile
...
builder: return image ID in API when using buildkit
Upstream-commit: 1da7d2eebf0a7a60ce585f89a05cebf7f631019c
Component: engine
2018-07-04 00:20:25 +02:00
642a920980
builder: do not send duplicate status for completed jobs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6f7dd9428e2134239467815c51aaab85756adb11
Component: engine
2018-07-03 14:47:38 -07:00
2a9011606f
builder: return image ID in API when using buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ca8022ec63a9d0e2f9660e2a3455d821abf8f517
Component: engine
2018-07-03 19:11:02 +00:00
b6f10654ea
Update documents of Detect
...
By 0296797f0f39477d675128c93c1646b3186937ee, `progressReader`
and `remoteURL` were removed from arguments. So developers who
use `Detect` not need to care about when `ProgressReaderFunc`
is used.
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 0bbd476ceb8da679f818df529cc917ec807a16af
Component: engine
2018-07-03 09:13:25 +09:00
bd47f635c0
Update documents of dispatchAdd
...
`ADD` does not support git.
Ref: https://github.com/moby/moby/issues/14704#issuecomment-298134333
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 9b374801ac843c3401bfb21d8fd5e205d0bba0d3
Component: engine
2018-07-03 08:51:07 +09:00
b3ce456eca
Merge pull request #37356 from Microsoft/jjh/new37316
...
LCOW: lazycontext: Use correct lstat, fix archive check
Upstream-commit: 1d7132e3d2d91168153db529b8900fb6e53aea92
Component: engine
2018-06-28 12:32:31 +02:00
d2c785277a
system: add back lcow validation function
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f0997716651b6e6c2b07e3d514bf8452114a1433
Component: engine
2018-06-27 15:24:26 -07:00
c377af1d4d
builder: update platform support to puller
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0b50d6c315a41025de98617bd6cc79c3925838d5
Component: engine
2018-06-27 14:59:36 -07:00
b67a507422
distribution: fix passing platform struct to puller
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 337ba71fc1124603302e28d94e2f08674e31a756
Component: engine
2018-06-27 14:59:31 -07:00
fbe0a9291a
LCOW: lazycontext: Use correct lstat, fix archive check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a5aed699cfaa4d84b1b134033fb468b3a7a874f0
Component: engine
2018-06-27 13:29:21 -07:00
28ca1b95b2
api: fix platform type
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 81f862a1fe6f24fea70b1278a4292eefc4029a03
Component: engine
2018-06-26 22:59:17 -07:00
23cd5508d9
builder: buildkit rebase update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 48b93419dcc3dc71584d674f045c30793b890395
Component: engine
2018-06-26 22:59:17 -07:00
0c25b296c2
Initial support for OCI multi-platform image
...
Add the OCI spec compatible image support in client side.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 7f334d3acfd7bfde900e16e393662587b9ff74a1
Component: engine
2018-06-26 11:39:29 -07:00
758ffaf745
LCOW: Auto-select OS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Addresses https://github.com/moby/moby/pull/35089#issuecomment-367802698 .
This change enables the daemon to automatically select an image under LCOW
that can be used if the API doesn't specify an explicit platform.
For example:
FROM supertest2014/nyan
ADD Dockerfile /
And docker build . will download the linux image (not a multi-manifest image)
And similarly docker pull ubuntu will match linux/amd64
Upstream-commit: 35193c0e7dc301e1d2f6ea96e0ce34ffd2d4b88d
Component: engine
2018-06-26 11:37:43 -07:00
89a8d08125
Don't fail to start daemon if builder source is not available
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ca3e3fcf7e66554d20acd990a506d6ee5e368ca1
Component: engine
2018-06-13 09:33:19 -07:00
4cadaa03f8
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 38457285242e57306c5b7ee652c7ccbb9fbd6713
Component: engine
2018-06-13 09:04:30 +02:00
ed25213177
builder: update ID of trace messages
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8ccbc2c40a063dbd4251b684ded1573d99ded337
Component: engine
2018-06-10 10:05:32 -07:00
ea746c1733
builder: updates for newer containerd
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f41af1efd04ae054fea70c8999112b6dfd4dcf72
Component: engine
2018-06-10 10:05:31 -07:00
d3f78ce983
builder: override history dates from ref metadata
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0728fb2b6395bd52524a1e5c134a1b37848a9c56
Component: engine
2018-06-10 10:05:31 -07:00
bfaba7aa6b
Add support for schema 1 pull
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 96c65a3adf95bc2d972123036d6b81ea3432af33
Component: engine
2018-06-10 10:05:31 -07:00
d75f0ca946
builder: more experimental/windows validation
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 577732f655fc95396b8c2b9a45747c5c95760755
Component: engine
2018-06-10 10:05:30 -07:00
8a84262fd3
builder: fix cancellation context issue
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2567dd9afc070428082aa1bec14ee037337dd5c4
Component: engine
2018-06-10 10:05:30 -07:00
b29ae02ee8
builder: move tagging to exporter
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4cdb6853dcf7105bc355370dac7246d9061e23ee
Component: engine
2018-06-10 10:05:30 -07:00
e7c54d5a63
builder: lint fixes
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 157b0b30dbf2f5af5c5b121bee60c1951af71fb5
Component: engine
2018-06-10 10:05:29 -07:00
f872f0f30d
builder: support for images without layers
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9328f0479b810c76fd5944bf9c856cea1af0c498
Component: engine
2018-06-10 10:05:29 -07:00