toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,304 Commits 3 Branches 295 Tags
f864453cb72b4de36a5891f5099ce584f51cab83
Commit Graph
42304 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle f864453cb7 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-26 16:37:03 +00:00
Sebastiaan van Stijn 5e51fc1169 Merge pull request #1394 from thaJeztah/18.09_backport_ 
[18.09] backport fix substitution with non-empty env-var
Upstream-commit: 0b11120060
Component: cli
 2018-09-26 15:33:01 +02:00
Silvin Lubecki 1be325e42d Merge pull request #1342 from tonistiigi/1809-fix-os-race 
[18.09] backport connhelper: fix cmd.Wait() race
Upstream-commit: e57b20642d
Component: cli
 2018-09-26 15:30:00 +02:00
Sebastiaan van Stijn 35e5a1ade4 Fix substitution with non-empty env-var 
Due to a typo, substitution would not work if the given
environment-variable was set.

Given the following docker compose file;

```yaml
version: "3.7"

services:
  app:
    image: nginx:${version:-latest}
```

Deploying a stack with `$version` set would ignore the `$version`
environment variable, and use the default value instead;

```bash
version=alpine docker stack deploy -c docker-compose.yml foobar

Creating network foobar_default
Creating service foobar_app

docker service ls

ID                  NAME                MODE                REPLICAS            IMAGE               PORTS
rskkjxe6sm0w        foobar_app          replicated          1/1                 nginx:latest
```

This patch also fixes "soft default" not detecting empty environment variables,
only non-set environment variables.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ec3daea021)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b8702b8a9a
Component: cli
 2018-09-26 15:20:15 +02:00
GordonTheTurtle 487b834eb7 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-24 21:03:05 +00:00
Eli Uriegas f884fc9695 Merge pull request #237 from jose-bigio/18.09_epoch_bump 
[18.09] epoch bump
Upstream-commit: cb57569b5dfb4118fbcaab5815fd5c9c6ce678f1
Component: packaging
 2018-09-24 11:14:05 -07:00
Eli Uriegas b9e7fd77da Bump epoch to 5 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 024e366bd36799b24a1b8f4666de62208fb7d9a5)
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 6e43dbbc35edc5a9842c8c37654a9d14294682a1
Component: packaging
 2018-09-24 10:40:01 -07:00
GordonTheTurtle 600e8631b0 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-22 08:08:18 +00:00
GordonTheTurtle 0ee62c387c Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-22 07:42:33 +00:00
Andrew Hsu ec828168f7 Merge pull request #1386 from tiborvass/18.09-df-verbose-format-raw 
[18.09] system/df: allow -v with --format
Upstream-commit: 5ba5678898
Component: cli
 2018-09-22 00:25:21 -07:00
Andrew Hsu 42f77ded0c Merge pull request #51 from thaJeztah/18.09_backport_fix-libcontainerd-startup-error 
[18.09] backport: Add fail fast path when containerd fails on startup
Upstream-commit: e69efe2ef5d24c3e7a4bd139d34cfa1ff7180869
Component: engine
 2018-09-22 00:11:43 -07:00
Andrew Hsu 4e7c09cfd0 Merge pull request #60 from tiborvass/18.09-remove-boltdb 
[18.09] Remove boltdb dependency
Upstream-commit: ccab60936554e7bbcc06d507b5d9217ed0f80f69
Component: engine
 2018-09-22 00:11:17 -07:00
Andrew Hsu 9f476ca387 Merge pull request #59 from tonistiigi/buildkit-1809 
[18.09] Backport Buildkit fixes for 18.09
Upstream-commit: 0a6866b8396d076765a2419e81e23c920c3a6a48
Component: engine
 2018-09-21 21:59:27 -07:00
Tibor Vass 49102eef76 system/df: allow -v with --format 
This allows to provide more information for build cache disk usage.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit a90b99edfc)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9de1318e36
Component: cli
 2018-09-22 01:33:03 +00:00
Tibor Vass 47296e79f8 vendor: remove boltdb dependency which is superseded by bbolt 
This also brings in these PRs from swarmkit:
- https://github.com/docker/swarmkit/pull/2691
- https://github.com/docker/swarmkit/pull/2744
- https://github.com/docker/swarmkit/pull/2732
- https://github.com/docker/swarmkit/pull/2729
- https://github.com/docker/swarmkit/pull/2748

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: cce1763d57b5c8fc446b0863517bb5313e7e53be
Component: engine
 2018-09-22 01:24:11 +00:00
GordonTheTurtle 7799325488 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-22 01:03:02 +00:00
GordonTheTurtle 0fed403b92 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-22 00:36:57 +00:00
Tibor Vass f3dec68e23 builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit d0f00bc1fb2c349ad72ecc2394b8474937de84dd)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3d67dd046539f8e04db82ce07ea56f97b832676b
Component: engine
 2018-09-21 17:06:25 -07:00
Tibor Vass 4f76283213 builder: use buildkit's GC for build cache 
This allows users to configure the buildkit GC.

The following enables the default GC:
```
{
  "builder": {
    "gc": {
      "enabled": true
    }
  }
}
```

The default GC policy has a simple config:
```
{
  "builder": {
    "gc": {
      "enabled": true,
      "defaultKeepStorage": "30GB"
    }
  }
}
```

A custom GC policy can be used instead by specifying a list of cache prune rules:
```
{
  "builder": {
    "gc": {
      "enabled": true,
      "policy": [
        {"keepStorage": "512MB", "filter": ["unused-for=1400h"]]},
        {"keepStorage": "30GB", "all": true}
      ]
    }
  }
}
```

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 4a776d0ca76c4bdf4399aef8c102361d6c2819eb)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 73e2f72a7c5bd6d6f8306e0ffe4371e1c3b00a21
Component: engine
 2018-09-21 17:06:25 -07:00
Anda Xu dc48089436 add support of registry-mirrors and insecure-registries to buildkit 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 171d51c861b479af8798fbe7c51906bcecdffea0)
(cherry picked from commit a72752b2f74467333b4ebe21c6c474eb0c2b99e0)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2926a45be6b9315d2ddeec27d1193278b6bbae91
Component: engine
 2018-09-21 17:06:25 -07:00
Anda Xu b69d4cb4ec update vendor 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 308701fac6f716160283ca0868da59aba2ea7eb5)
(cherry picked from commit b48afc216f46c8e786560b807528699012e1627b)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b73fd4d936864998451cdd37f45694541e43006e
Component: engine
 2018-09-21 17:06:25 -07:00
Tibor Vass 248d11e3f9 daemon/images: removed "found leaked image layer" warning, because it is expected now with buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5aa222d0fe5a420dae96be0c04a33308823e0d0f)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: bb2adc4496f2fd1b755fc701dbed5dab33175efd
Component: engine
 2018-09-21 17:06:25 -07:00
Tonis Tiigi ff79736ce2 vendor: update bolt to bbolt 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b501aa82d5151b8af73d6670772cc4e8ba94765f
Component: engine
 2018-09-21 17:06:25 -07:00
Tonis Tiigi a4444691f3 vendor: add bbolt v1.3.1-etcd.8 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 46a703bb3bfe75e99de2cc457dc0d568a1976a6b
Component: engine
 2018-09-21 17:06:25 -07:00
docker-unir[bot] 61bc572a6e Merge pull request #235 from seemethere/backport_f 
Merged with https://github.com/seemethere/unir
Upstream-commit: 4d3c344a28c3105f9698ed3ae5213e85188eca97
Component: packaging
 2018-09-21 22:20:55 +00:00
Andrew Hsu 0cc0272882 Merge pull request #1381 from dhiltgen/revamp_18.09 
[18.09] `docker engine` updates
Upstream-commit: 19e1ab273e
Component: cli
 2018-09-21 15:12:54 -07:00
Eli Uriegas edf7125231 Use image artifacts as daemon and dependencies 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 944fa7137c02ec56907b26fccfd3a363cd741890)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a66a0b6aee6ad2c9c52da728d1e70ce46fec017
Component: packaging
 2018-09-21 22:10:36 +00:00
Eli Uriegas 8da1ad1c75 Merge pull request #234 from jose-bigio/18.09_cherry_pick 
[18.09] Make -dm image based not tag based
Upstream-commit: 4264c8e1a826c76b0fde570f867cc7e7c6cd30bb
Component: packaging
 2018-09-21 15:06:42 -07:00
Eli Uriegas 46a53355c9 Make -dm image based not tag based 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 206d61f29d1722ae3e319e22a4c5c88d1baf6e13)
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: aea8f6a1db61a0bb0748f3420e125fcc06e8e0a6
Component: packaging
 2018-09-21 14:14:28 -07:00
GordonTheTurtle 1cc89a01f6 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-21 21:04:06 +00:00
Daniel Hiltgen a7ed2532ff Fix vendoring glitch 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: ec1812188f
Component: cli
 2018-09-21 13:16:34 -07:00
Andrew Hsu 4c429518af Merge pull request #52 from thaJeztah/18.09_backport_fix-TestServiceWithDefaultAddressPoolInit 
[18.09] backport TestServiceWithDefaultAddressPoolInit: avoid panic
Upstream-commit: ff9340ca2cc003d0829216524c6f96b98ce62f16
Component: engine
 2018-09-21 11:19:57 -07:00
Daniel Hiltgen 92a89516ee Fix lint glitches 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 6004d74b1f
Component: cli
 2018-09-21 11:01:17 -07:00
Andrew Hsu be44262dc3 Merge pull request #57 from AntaresS/cherry-37871 
[18.09] backport fixing daemon won't start when "runtimes" option defined in both config file and cli
Upstream-commit: 90a90ae2e1fdb1f9782a51e41fe2b7dc80d48952
Component: engine
 2018-09-21 09:54:31 -07:00
GordonTheTurtle 49c0046ea6 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-21 12:37:00 +00:00
Sebastiaan van Stijn ae721f13eb Merge pull request #1382 from thaJeztah/18.09_manifest-inspect-insecure-fix 
[18.09] backport fix insecure manifest inspect with restrictive certs perms
Upstream-commit: e79e591ee9
Component: cli
 2018-09-21 12:53:24 +02:00
Daniel Hiltgen f074e8a141 Remove metadata file before writing 
The packages will deliver this as a link so lets make sure we don't
write through the link to the underlying packaged file.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 0f22d7e295
Component: cli
 2018-09-20 18:00:46 -07:00
GordonTheTurtle 6a86f233f3 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-20 21:03:29 +00:00
Daniel Hiltgen e5e1355bb7 Review comments 
Address code review comemnts and purge additional dead code.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f250152bf4
Component: cli
 2018-09-20 12:01:20 -07:00
Eli Uriegas 04ec85f5b8 Merge pull request #226 from thaJeztah/18.09_more_updates_to_package_description 
[18.09] more updates to package description
Upstream-commit: 43f81b5c522ea597c22a1e3e484fc911c865f7aa
Component: packaging
 2018-09-20 11:54:50 -07:00
Eli Uriegas 1e6a450e9c Merge pull request #225 from thaJeztah/18.09_update_package_description 
[18.09] backport update package description
Upstream-commit: 1cb8fe5bda7d7b92646e5ea859fc5ada832bb0b2
Component: packaging
 2018-09-20 11:54:31 -07:00
Eli Uriegas feaf4f4d37 Merge pull request #230 from kolyshkin/18.09-fix-path 
[18.09] systemd/docker.service: fix PATH
Upstream-commit: 1b2edd1ffda28df88692bb7faa16ac30f879c5b7
Component: packaging
 2018-09-20 11:53:29 -07:00
Eli Uriegas e0ec331c69 Merge pull request #227 from thaJeztah/18.09_update_fedora_list 
[18.09] backport Update outdated Fedora versions
Upstream-commit: 8751612797e77ddaa14674aeda1bffd5f85c27b7
Component: packaging
 2018-09-20 11:45:24 -07:00
Eli Uriegas 12e294aaf5 Merge pull request #229 from thaJeztah/18.09_revert_suffix 
[18.09] revert "Specify suffix for DEB_VERSION"
Upstream-commit: ea3b15971e895c2a259bc2fca04f323a8e8a6fb6
Component: packaging
 2018-09-20 11:45:02 -07:00
Anda Xu 812694c0cc fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 8392d0930b511402aa7aa71ccfe6c0d4a8159237)
Upstream-commit: 66ed41aec82dbcdfbc38027e3d800e429af1cd58
Component: engine
 2018-09-20 10:54:47 -07:00
Christy Norman 622b5b7f2d fix insecure manifest inspect with restrictive certs perms 
If, for some reason, the certs directory has permissions that are
inaccessible by docker, we should still be able to fetch manifests using
the `insecure` flag.

Since the cli doesn't access the engine's list of insecure registries,
the registry client should make a singleton list of the registry being queried with the
`insecure` flag.

Closes #1358

Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
(cherry picked from commit d57adbc034)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f9d666b057
Component: cli
 2018-09-20 19:53:10 +02:00
Kir Kolyshkin 49de0c314f deb/systemd: remove 
These files are not used, and having them in repo is misleading.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: fca673ad8051d1b377435821ec6c76c0de24b663
Component: packaging
 2018-09-20 10:16:39 -07:00
Kir Kolyshkin be5df7c46b systemd/docker.service: fix PATH 
Set the PATH to what appears to be the standard on latest Ubuntu (18.04)
and Debian (9), fixing the following two issues:

1. PATH did not contain /bin (leading to ContainerTop/ps not working
on newer distros, among the other things).

2. $PATH can't be specified in Environment directives in .service files.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 62d9a0d1253049a2fab10f938542a8e09dd0804a
Component: packaging
 2018-09-20 10:09:10 -07:00
Sebastiaan van Stijn 76823a4d29 Revert "Specify suffix for DEB_VERSION" 
This reverts commit 6c5b7fcb956871f7a44e1a478ad9450f9df4bed1.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 00104664c15a6025451ae766b77b78b347ee1ad3
Component: packaging
 2018-09-20 16:06:01 +02:00
Justin Clift 0ef2a783ef Update outdated Fedora versions 
(cherry picked from commit f0212649020ad5a1b0ca17c61ab500992ac981b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5f5601309ac7c0814b077166aa3b101c8bfce6fe
Component: packaging
 2018-09-20 13:04:16 +02:00