toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,335 Commits 3 Branches 295 Tags
b774296769f9dca379bd3fdbf0d24de1f64b4513
Commit Graph
838 Commits
Author SHA1 Message Date
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
Sebastiaan van Stijn 659852c34d Merge pull request #37011 from arm64b/ReAdd-LABEL-command-4-target-option 
Construct and add 'LABEL' command from 'label' option to last stage 
Upstream-commit: 8974fd47c7677b21c43597709655136addadb864
Component: engine
 2018-05-21 00:15:02 +02:00
Sebastiaan van Stijn fac8e1d52b Replace deprecated testutil.ErrorContains() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 55bebbaecf5e40db9d83b28080ce08dc8642f407
Component: engine
 2018-05-21 00:13:04 +02:00
Tibor Vass 1ed95ff31a Merge pull request #37091 from thaJeztah/fix-linting-errors 
Fix some linting issues
Upstream-commit: 1b75e175842e5ef59284a1c8ca7d64e4d6b62384
Component: engine
 2018-05-19 08:39:39 -10:00
Eli Uriegas 7a1680b13a Remove references to old release process 
This hasn't been the way to release Docker for the past year so let's
just remove them altogether

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 80bc8b4766cc808186af91930152d78afb22aef8
Component: engine
 2018-05-18 18:28:43 +00:00
Sebastiaan van Stijn 7f78f7fe15 Fix some linting issues 
These showed locally when running `make validate`. CI doesn't seem to have the
same (possibly it's disabled in the configuration)

    builder/fscache/fscache.go:618::error: github.com/docker/docker/vendor/github.com/tonistiigi/fsutil.StatInfo composite literal uses unkeyed fields (vet)
    client/swarm_unlock_test.go:44::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
    client/swarm_unlock_test.go:20::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
    cmd/dockerd/daemon_unix.go:113::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
    cmd/dockerd/daemon_unix.go:110::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay/overlay.go:171::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay/overlay.go:413::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay2/overlay.go:203::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay2/overlay.go:584::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/zfs/zfs.go:109::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/zfs/zfs.go:388::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/volumes_windows.go:27::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    integration/service/network_test.go:31::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
    api/server/server.go:129:10⚠️ should not use basic type string as key in context.WithValue (golint)
    integration/service/network_test.go:54::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
    libcontainerd/client_daemon_linux.go:61::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    libcontainerd/client_daemon_linux.go:74::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    pkg/archive/archive_windows.go:76::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    plugin/manager_linux.go:56::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f8c870d623c63b98f8ef8002448f07f4dda4aa9
Component: engine
 2018-05-17 19:28:27 +02:00
Dennis Chen 7273d67395 Remove unused 'label' related functions 
Since we use `NewLabelCommand()` instead of `addNodesForLabelOption()`
to create the 'LABEL' commands from '--label' options, so all the related
functions should be removed.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: c7b543164daed58fbea36471592438b4e53ab748
Component: engine
 2018-05-17 09:41:06 +08:00
Dennis Chen 0b32e0ce4f Add 'LABEL' command from '--label' to the last stage 
This PR is tring to fix issue #36996.

Currently for multi-stage build, if `--target` specified, the `--label` option
will be ignored. The root cause is the last stage build will remove the `LABEL`
command(s) node created from the `--label` option. In order to address this issue,
we can create `LABEL` command(s) and add it/tem to the last stage.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: 9c238ebd55e4105ad7f7edc04231ea61bb278ae8
Component: engine
 2018-05-17 09:40:19 +08:00
Priya Wadhwa d39da73d16 Export BuildArgs 
Signed-off-by: Priya Wadhwa <priyawadhwa@google.com>
Upstream-commit: 593255ffb07989e416743d4235fef65e75414e6b
Component: engine
 2018-05-08 14:57:26 -07:00
Dennis Chen 4c5e76b26e Fix the target name issue for multi-stage build 
This PR is trying to fix issue #36956.

The stage name is case-insensitive by design, so we should use
`strings.EqualFold()` as the comparison method to eliminate the
case sensitive noise.

Also we need to return a pre-defined error code order to avoid below
message like:
"FIXME: Got an API for which error does not match any expected type!!!:
failed to reach build target dev in Dockerfile"

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Upstream-commit: 7c0570473cfa181aeb3278072cc9af4f9298cb98
Component: engine
 2018-05-01 10:28:40 +08:00
Kir Kolyshkin e3af8e0774 Switch from x/net/context -> context 
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 7d62e40f7e4f3c17d229a7687d6fcca5448de813
Component: engine
 2018-04-23 13:52:44 -07:00