toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,333 Commits 3 Branches 295 Tags
23a691f07a1b1842b2d49372a5aa49ee377863f7
Commit Graph
42333 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 23a691f07a Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-28 21:52:21 +00:00
Andrew Hsu 6feb3a98d4 Merge pull request #1388 from dhiltgen/revamp_18.09 
[18.09] Refine how metadata dir is handled
Upstream-commit: 5d3ab5bc0c
Component: cli
 2018-09-28 14:23:12 -07:00
Daniel Hiltgen ff2d0e0b89 Refine how metadata dir is handled 
This is a follow up PR to #1381 to address some of the review comments
we didn't get to.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: c12e23a4c1
Component: cli
 2018-09-28 14:14:13 -07:00
GordonTheTurtle a0bb6d8712 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-28 21:03:53 +00:00
Andrew Hsu a6c487557f Merge pull request #1387 from dhiltgen/activate_ux 
[18.09] Expose licensing details before loading
Upstream-commit: aca3f2d382
Component: cli
 2018-09-28 14:02:48 -07:00
Andrew Hsu fdf9f276f8 use gotest.tools/fs for TestActivateExpiredLicenseDryRun 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a7488d1bcd
Component: cli
 2018-09-28 20:50:43 +00:00
Daniel Hiltgen cb4c2a9e5e Expose licensing details before loading 
Help the user understand which license they're about
to load in case they have multiple licenses they need to
figure out.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 5a97a93ae1
Component: cli
 2018-09-28 20:50:43 +00:00
Daniel Hiltgen c3605e497b Vendor bump of licensing lib 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 41910b6d68
Component: cli
 2018-09-28 20:50:43 +00:00
Andrew Hsu 683cfd7a61 Merge pull request #56 from thaJeztah/18.09_backport_more_permissive_daeon_conf_dir 
[18.09] backport loosen permissions on /etc/docker directory
Upstream-commit: 34b3cf4b0cf6867c81cb370b4e2056e0947ee4fd
Component: engine
 2018-09-28 11:42:01 -07:00
Andrew Hsu ffeda4bbea Merge pull request #63 from tiborvass/18.09-vndr-buildkit 
[18.09] vendor buildkit to 8f4dff0d16ea91cb43315d5f5aa4b27f4fe4e1f2
Upstream-commit: 51618f7a83f008e5f14d5cbe634add11fd3afcb0
Component: engine
 2018-09-28 10:57:56 -07:00
Tibor Vass f4dc4cdbaa vendor buildkit to 8f4dff0d16ea91cb43315d5f5aa4b27f4fe4e1f2 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e161a8d1e9e84f50410860d903205e6d2dc86110)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 67541d5841e645f3408b01f189ec4339df449edc
Component: engine
 2018-09-27 22:46:57 +00:00
GordonTheTurtle c299249618 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-27 05:18:27 +00:00
GordonTheTurtle 0f3ea59e24 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-27 04:54:08 +00:00
Andrew Hsu 939ed19be8 Merge pull request #1389 from mason-fish/fix-subscription-filter 
[18.09] fix subscription filter
Upstream-commit: 1a087e87c9
Component: cli
 2018-09-26 16:12:41 -07:00
Eli Uriegas 3ebe55dfc1 Merge pull request #245 from seemethere/upgrade_1809 
[18.09] Fix debian package upgrade scenarios
Upstream-commit: 379255ca5b687fc0f6d8b47cb96493d192e1d776
Component: packaging
 2018-09-26 15:48:44 -07:00
Eli Uriegas 6b7718669e Fix debian package upgrade scenarios 
Epoch needs to be included in the Replaces / Breaks sections

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit f6a3e274b4892f8f501e1191a73d8b8935a56aa5)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: bebe7028c6b41ecee80278cdfc46de1e7704d199
Component: packaging
 2018-09-26 22:28:39 +00:00
GordonTheTurtle 7253d5a25e Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-26 20:58:17 +00:00
Eli Uriegas aaffed2dc6 Merge pull request #242 from seemethere/remove_env_1809 
[18.09] Remove Environment, not needed anymore
Upstream-commit: dd7701addaba44f3716d8c40e5554f3bf043b0d6
Component: packaging
 2018-09-26 13:21:33 -07:00
Eli Uriegas 7716893c2a Merge pull request #241 from seemethere/fix_static_builds_1809 
[18.09] Fix static builds relying on the docker-* prefix
Upstream-commit: 6a38ee294c5abbaa9b50e596e2c222f1c3d4a9dc
Component: packaging
 2018-09-26 13:21:11 -07:00
GordonTheTurtle aa738a9737 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-26 19:15:24 +00:00
Eli Uriegas 552a0c76a2 Remove Environment, not needed anymore 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 9eac27f0ee2d02355ecdeea243d2607d633c0b0b)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 08dd353c77bb97339a3c8d1b11712cdd6323c436
Component: packaging
 2018-09-26 19:00:07 +00:00
Eli Uriegas adcef4519f containerd-ctr -> ctr 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 75906054befc177621bc015ab0802e1fad18c187
Component: packaging
 2018-09-26 18:57:16 +00:00
Andrew Hsu 3675feadab rename binaries to remove docker prefix 
For static builds.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 43ebdc0845840c13c2f92c7b564ddb56eb38d428
Component: packaging
 2018-09-26 18:57:16 +00:00
Eli Uriegas bc2a5f99f9 Merge pull request #61 from tiborvass/18.09-remove-docker-prefix-containerd 
[18.09] Remove 'docker-' prefix for containerd and runc binaries
Upstream-commit: 989fab3c718fb83f543cc6414e6ba7c6f724a416
Component: engine
 2018-09-26 11:45:50 -07:00
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
Tibor Vass 3be9a1e274 fix daemon tests that were using wrong containerd socket 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 52b60f705ca3f12df01b0cf1002860b842770c74)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6bf8dfc4d89461228031a595d63482b9603c8899
Component: engine
 2018-09-25 23:09:25 +00:00
Tibor Vass 1c28fdbba1 hack/make: remove 'docker-' prefix when copying binaries 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 361412c79eeacf11b07871870e875f9e5bce3ea7)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e090646d477f2e7d00aba971bcc187f3af7948a3
Component: engine
 2018-09-25 23:09:25 +00:00
Mason Fish 3632151436 fix subscription filter 
Signed-off-by: Mason Fish <mason.fish@docker.com>
Upstream-commit: a31b20d7db
Component: cli
 2018-09-24 16:56:05 -07:00
Tibor Vass b48ad13f28 Remove 'docker-' prefix for containerd and runc binaries 
This allows to run the daemon in environments that have upstream containerd installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 34eede0296bce6a9c335cb429f10728ae3f4252d)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b3bb2aabb8ed5a8af0a9f48fb5aba3f39af38e0d
Component: engine
 2018-09-24 22:35:36 +00: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