p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,396 Commits 2 Branches 295 Tags
02405253edfc44dc3afef532ebf5da3ca2925bf9
Commit Graph

848 Commits

Author SHA1 Message Date
Yuichiro Kaneko
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
Sebastiaan van Stijn
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
John Howard
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
Tonis Tiigi
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
Tonis Tiigi
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
Dennis Chen
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
John Howard
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
John Howard
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
Vincent Demeester
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
Derek McGowan
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
629c647dcf builder: enable gateway through syntax directive 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 72d10ced7dfd013be91347e92723bbbf62539765
Component: engine
 2018-06-10 10:05:29 -07:00
Tonis Tiigi
1a41f07112 builder: add support for separate upload-request 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a25846a67527b2a8de5159608979fc7ff9d70bdf
Component: engine
 2018-06-10 10:05:29 -07:00
Tonis Tiigi
cd6ea182f9 builder: protect early progress writes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f3ef8c93d617bdcf250c7b682861c590e7fce411
Component: engine
 2018-06-10 10:05:29 -07:00
Tibor Vass
f50adc2424 builder: fix compiling with buildkit on windows and integration tests 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3a1da5c534bb71149036eb67792a4eb4f6474144
Component: engine
 2018-06-10 10:05:28 -07:00
Tonis Tiigi
a9e10d0f4d builder: add support for building from tarball 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 92395261b05610ca0a8ae799220ce29f8ee00fac
Component: engine
 2018-06-10 10:05:28 -07:00
Tonis Tiigi
acec416240 builder: patch incomplete download handling 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8900e3c758457785b121368ce832946634b9da00
Component: engine
 2018-06-10 10:05:28 -07:00
Tonis Tiigi
11b7f9664a builder: fixes after rebase 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ed651e796c6fd91d533eadaacfb57c36702edd39
Component: engine
 2018-06-10 10:05:28 -07:00
Tonis Tiigi
3a980ed674 builder: expand prune to buildkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 760ecf958b741beb1c645a96e69065af9ebcad79
Component: engine
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
4cc215fd04 builder: add usage to snapshotter adapter 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f0a9e54d200e317eb12ccbe9fee1d0c3a49366f5
Component: engine
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
33e5fdd844 builder: export build cache records 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b225258496f3ec8b6906b3fc6a3a2c76e50502d9
Component: engine
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
f1bc9dea89 builder: produce duplicate cache keys on pull 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: bb68c8132b593cb2fd633f2cb1c8761243c0b120
Component: engine
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
ccc559564d builder: adapter update after vendor update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b7424599f696ed30d6e29630e3324c2915732f2e
Component: engine
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
63a842126f builder: add cache-from support to buildkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 46bd229b5168e3d00e524e24c13545c718e3144f
Component: engine
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
edce20e895 builder: add graceful cancellation endpoint 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0bddd4ccfee5b7f4f69cd4757f053214be2ad4cd
Component: engine
 2018-06-10 10:05:26 -07:00
Tonis Tiigi
08ef676cdf builder: experimental buildkit base 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 22f7caee03b807f50f993eb387a4017acab1657e
Component: engine
 2018-06-10 10:05:26 -07:00
Tonis Tiigi
7cbdbc32f3 builder: snapshotter and exporter 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 27fa0e8a7b9b922dc3955cc2cee82b4fefc331c4
Component: engine
 2018-06-10 10:05:26 -07:00
Sebastiaan van Stijn
d95a00a489 Merge pull request #37189 from arm64b/create-intermediate-for-COPY-ADD 
Refactor and cleanup the intermediate container creation
Upstream-commit: 52ea99eda2ea29d9a0e4111f1e7a0b382d8d9408
Component: engine
 2018-06-07 21:20:17 -07:00
Dennis Chen
1542f5e969 Refactor and cleanup the intermediate container creation 
This PR is trying to refactor the `probeAndCreate` and cleanup
related codes based on the refactoring.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: 7f280f6f6514598a31d2523d4b9437ca07ee0526
Component: engine
 2018-06-04 12:55:49 +08:00
Tonis Tiigi
2f23577c7a vendor: use dockerfile parser from buildkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c9ebd2f13b3aab49c2d90cc38dcf2cd0d059697f
Component: engine
 2018-06-02 11:10:34 -07:00
Vincent Demeester
065fbace32 Merge pull request #37178 from tonistiigi/layer-leak 
builder: fix layer leak on multi-stage wildcard copy
Upstream-commit: 3e494c4b934b7fc3756d91b6e8117c9e4d7c28f1
Component: engine
 2018-05-31 09:39:28 +02:00
Tonis Tiigi
442215fe6a builder: fix layer leak on multi-stage wildcard copy 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4a18c11bdc1300692def2453c441190d73e1e942
Component: engine
 2018-05-30 15:18:40 -07:00
Sebastiaan van Stijn
87e43e1762 Handle multi-digit positional parameters 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2628896b5e813491f8767ec7fa9d0f057ed4a86e
Component: engine
 2018-05-25 18:51:11 +02:00
Sebastiaan van Stijn
45e3784610 Add detection of "special parameters" for substitution 
Detect Special parameters as defined in
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_05_02

Treat these as parameters that are not set, instead of
producing an error that a modifier is missing.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9654e9b6f80e1b931763c04400a19596e256c99a
Component: engine
 2018-05-25 18:20:22 +02:00
Sebastiaan van Stijn
0ed9886f87 Add more test-cases for positional parameters 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8687a3f4b8b7ffbc3f32dfe959cb771d662211e6
Component: engine
 2018-05-25 18:20:10 +02:00
Sebastiaan van Stijn
ad9f08c725 Add line-numbers to asserts 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b80e0309d220268a2b9e6aec5bb05d7af330e591
Component: engine
 2018-05-25 18:20:01 +02:00
Sebastiaan van Stijn
1f9af8d4f9 Fix detection for missing parameter in substitution 
`${}`, `${:}` and so on are invalid because there's
no parameter within the brackets; fix detection for
this situation and add/update tests.

There were some existing test-cases that were testing
for the wrong behavior, which are now updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 334bf3ea76004d0abe02dd1698989f9eaf87a86a
Component: engine
 2018-05-25 18:19:32 +02:00
Sebastiaan van Stijn
c8db46ad05 builder: fix processing of invalid substitusion syntax 
The builder did not detect syntax errors in substitusions in the
Dockerfile, causing those values to be processed incorrectly instead of
producing an error.

Example 1: missing `}`

    docker build --no-cache -<<'EOF'
    FROM busybox
    ARG var=${aaa:-bbb
    RUN echo $var
    EOF

Before:

    Step 3/3 : RUN echo $var
     ---> Running in f06571e77146
    bbb

After:

    Step 2/3 : ARG var=${aaa:-bbb
    failed to process "${aaa:-bbb": syntax error: missing '}'

Example 2: missing closing `}`, no default value

    docker build --no-cache -<<'EOF'
    FROM busybox
    ARG var=${aaa
    RUN echo $var
    EOF

Before:

    Step 2/3 : ARG var=${aaa
    failed to process "${aaa": missing ':' in substitution

After:

    Step 2/3 : ARG var=${aaa
    failed to process "${aaa": syntax error: missing '}'

Example 3: double opening bracket (`{`)

    docker build --no-cache -<<'EOF'
    FROM busybox
    ARG var=${{aaa:-bbb}
    RUN echo $var
    EOF

Before:

    Step 2/3 : ARG var=${{aaa:-bbb}
    failed to process "${{aaa:-bbb}": missing ':' in substitution

After:

    Step 2/3 : ARG var=${{aaa:-bbb}
    failed to process "${{aaa:-bbb}": syntax error: bad substitution

Example 4: double opening bracket (`{`), no default value

    docker build --no-cache -<<'EOF'
    FROM busybox
    ARG var=${{aaa}
    RUN echo $var
    EOF

Before:

    Step 2/3 : ARG var=${{aaa}
    failed to process "${{aaa}": missing ':' in substitution

After:

    Step 2/3 : ARG var=${{aaa}
    failed to process "${{aaa}": syntax error: bad substitution

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 955a6ad95f7891a45692d975793abf1eeb07cdd5
Component: engine
 2018-05-25 18:19:17 +02:00
Sebastiaan van Stijn
0f96e98e12 Various code-cleanup 
remove unnescessary import aliases, brackets, and so on.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f23c00d8701e4bd0f2372a586dacbf66a26f9a51
Component: engine
 2018-05-23 17:50:54 +02:00
Yong Tang
b21cab8bb2 Merge pull request #37110 from thaJeztah/remove-testutil-errorcontains 
Replace deprecated testutil.ErrorContains()
Upstream-commit: 9bd5d9912f0cb4fe22b994ac1e7e10038e3be65a
Component: engine
 2018-05-21 11:04:45 -07:00