toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,167 Commits 3 Branches 295 Tags
4a4191fafe045cd46a97ad247214b3d94aeb6600
Commit Graph
42167 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 4a4191fafe Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-10 21:06:01 +00:00
Jose Bigio 6af5c2b6a9 Merge pull request #185 from corbin-coleman/add-build-image-arg 
[18.09] Parameterize Dockerfiles base build images
Upstream-commit: 66979a05d0debb27007da2861d909db7c1a7fb2a
Component: packaging
 2018-09-10 10:30:46 -07:00
GordonTheTurtle 5e8bd8d686 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-10 17:03:06 +00:00
corbin-coleman d10c52eaae Parameterize Dockerfiles base build images 
This will make it easier for anybody to build with a specific version of a distro they want to build on.
They could lock into a specific sha of a docker image if they wanted, as an example.

Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Upstream-commit: 7afc35b95ac46bfef383788341ddb0b157af14eb
Component: packaging
 2018-09-10 16:54:32 +00:00
Eli Uriegas 8644fd23bd Merge pull request #193 from dhiltgen/bump_epoch 
[18.09] Bump packaging epoch
Upstream-commit: 346f22eb45a72e6087d0996b4cd5699346c10e74
Component: packaging
 2018-09-10 18:41:49 +02:00
Eli Uriegas 7e81969c88 Merge pull request #192 from seemethere/no_offline_installer_1809 
[18.09] Remove offline installer to install shim-process
Upstream-commit: a44c95733f9474359e96c7187d9e31e0db22ab50
Component: packaging
 2018-09-10 18:41:30 +02:00
Daniel Hiltgen 3082638047 Bump packaging epoch 
This should accomodate the new versioning fix

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: be00095e1d0d5674665a63b6e5932178632feb0e
Component: packaging
 2018-09-10 08:26:11 -07:00
Eli Uriegas 6069864507 Remove offline installer to install shim-process 
Removes the need for the offline installer to install the shim process
and instead installs the shim process as part of the packaging.

May be easier in the future to just package the shim process on it's own
but that'll come after this 18.09 release

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit f8bd366d58f8bdf8a82b9a033353ca5bf4eda948)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 31d0cb047b98ab43f661bd026bdd63deef62543d
Component: packaging
 2018-09-10 14:06:32 +00:00
Jose Bigio a5616edf44 Merge pull request #551 from dhiltgen/fix_version 
[18.09] Fix version string
 2018-09-07 14:30:23 -07:00
GordonTheTurtle 1eb0dfc18f Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-07 17:03:46 +00:00
Daniel Hiltgen 14bef21142 Switch to plain version strings 
This removes the "ce" and "ee" portion of the version string

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2018-09-07 09:58:56 -07:00
docker-unir[bot] ca6cbf3a46 Merge pull request #190 from seemethere/1809_deb 
Merged with https://github.com/seemethere/unir
Upstream-commit: 8887f3388e8a91ca6b45854f4f354286102682ad
Component: packaging
 2018-09-07 15:55:26 +00:00
Eli Uriegas 07875f74c1 Fix docker-ce-cli replacing files 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 193a6be5de72509679c8729c8d4e3a81de4f1e8e)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 1293fb54734e6d4391cf6957eae7a1659306e4eb
Component: packaging
 2018-09-07 14:16:46 +00:00
Andrew Hsu 78a6bdb3e9 Merge pull request #556 from andrewhsu/beta 
[18.09]  bump ver 18.09.0-ce-beta1
 2018-09-06 15:22:37 -07:00
Andrew Hsu e11e1e776f remove changelog lines that need to be sorted later 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-09-06 21:06:28 +00:00
Andrew Hsu 595dca1ce7 bump ver 18.09.0-ce-beta1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-09-06 21:04:56 +00:00
GordonTheTurtle b5efc7fd18 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-06 21:03:43 +00:00
docker-unir[bot] 0e6daf811c Merge pull request #181 from seemethere/bump_1104 
Merged with https://github.com/seemethere/unir
Upstream-commit: 3921898c49fbb46e7a00d273cd208af233d5c0f7
Component: packaging
 2018-09-06 18:11:16 +00:00
GordonTheTurtle 3e0cdd1771 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-06 13:03:00 +00:00
Eli Uriegas ad43c8604b Merge pull request #182 from seemethere/backport_systemd 
[18.09] Update new systemd unit file with changes from upstream
Upstream-commit: a354d5f78fc58bd7a2526fcec87262a27d3b009d
Component: packaging
 2018-09-06 10:26:02 +01:00
Andrew Hsu 7989718c30 Merge pull request #555 from andrewhsu/v-6 
[18.09] bump ver 18.09.0-ce-tp6
 2018-09-05 16:44:35 -07:00
GordonTheTurtle b3f7bffa62 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-05 23:17:19 +00:00
Andrew Hsu 2b581132c7 Merge pull request #187 from andrewhsu/to 
[18.09] Update proxy commit for shutdown timeouts
Upstream-commit: fc32916152b333dcf8ade021242eb86bb1c6b301
Component: packaging
 2018-09-05 15:45:18 -07:00
Michael Crosby 14fc3fe7f5 Update proxy commit for shutdown timeouts 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 7941c692e67a67f011881bff1d200a2fcaeb6568)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 61d98f8540f8ef37e4940a6799077490a5756ebe
Component: packaging
 2018-09-05 22:39:47 +00:00
Andrew Hsu 159b106632 bump ver 18.09.0-ce-tp6 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-09-05 22:28:44 +00:00
GordonTheTurtle ee3281c00d Merge branch '18.09' of github.com:docker/docker-ce into 18.09 2018-09-05 21:03:08 +00:00
GordonTheTurtle 3c0a64bc35 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-05 21:02:57 +00:00
GordonTheTurtle 2de7c7a6ba Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-05 20:39:55 +00:00
GordonTheTurtle 98e7d7c042 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-05 20:36:54 +00:00
GordonTheTurtle 47ce4dc83f Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-05 20:15:13 +00:00
Andrew Hsu cceba0654c Merge pull request #1339 from andrewhsu/vr 
[18.09] vndr docker/docker to docker/engine d2ecc7b
Upstream-commit: 44371c7c34
Component: cli
 2018-09-05 11:43:09 -07:00
Andrew Hsu a65331fc7c Merge pull request #44 from andrewhsu/sup 
[18.09] Fix supervisor healthcheck throttling
Upstream-commit: 7485ef7e46e2766a0da06fc63001e84d8ea36514
Component: engine
 2018-09-05 11:14:31 -07:00
Andrew Hsu 3fb39207b2 vndr docker/docker to docker/engine d2ecc7b 
And update the associated packages that have also updated from
docker/docker vendor.conf.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 4e6798794d
Component: cli
 2018-09-05 17:35:51 +00:00
GordonTheTurtle 9736052cc9 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-05 17:05:03 +00:00
Andrew Hsu ee953424ff Merge pull request #43 from andrewhsu/tls 
[18.09] client: dial tls on Dialer if tls config is set
Upstream-commit: d2ecc7bad104139c118249ad159b45315a022754
Component: engine
 2018-09-05 06:43:23 -07:00
GordonTheTurtle a3c945ce7d Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-05 08:36:37 +00:00
Derek McGowan 1e791aef77 Fix supervisor healthcheck throttling 
Fix default case causing the throttling to not be used.
Ensure that nil client condition is handled.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit c3e32938430e03a316311f9e4fbdb743e492a07e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f121eccf29576ce5d4b8256a71a9d32ee688ff7d
Component: engine
 2018-09-05 06:59:52 +00:00
Tibor Vass 0512e4dbc2 Merge pull request #1334 from tiborvass/18.09-cmd-builder-prune-with-options 
[18.09] build: add options to builder prune
Upstream-commit: d8aefad94a
Component: cli
 2018-09-04 22:35:23 -07:00
GordonTheTurtle b88f0d2dc1 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-05 05:03:41 +00:00
Tibor Vass 15c2034539 system df: show table output for build cache 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit ca608c2302)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3c37d6a034
Component: cli
 2018-09-05 03:33:30 +00:00
Tibor Vass d62dfa0a57 build: add options to builder prune 
This patch adds --filter, --keep-storage, --all and --force to builder prune.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit c806eb49c9)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9d43f1ed48
Component: cli
 2018-09-05 03:33:30 +00:00
Andrew Hsu 52094c19a7 Merge pull request #42 from tiborvass/18.09-cp-buildkit 
[18.09] Buildkit cherry-picks
Upstream-commit: 00a9cf39edc2a8a2c83b488845f40e43b7f2cd37
Component: engine
 2018-09-04 18:46:24 -07:00
Tonis Tiigi 5722149ff5 client: dial tls on Dialer if tls config is set 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 5974fc25403f149be796c6d69270881854547633)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: c2d005320705c1339f8b2d5935f50f4c5b9cc6fc
Component: engine
 2018-09-05 01:17:31 +00:00
GordonTheTurtle b79c304fc7 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-04 21:05:06 +00:00
docker-unir[bot] 1973969411 Merge pull request #183 from dhiltgen/better_names_q3 
Merged with https://github.com/seemethere/unir
Upstream-commit: 7d267aead838281770e779c3552aaf2793c68cf2
Component: packaging
 2018-09-04 19:46:08 +00:00
Daniel Hiltgen 9ae8fd5cd9 Change deb package filenames to be unique 
It's generally bad-form to generate two identically named package files
that are actually different, so we should name our packages based on
the distro and version, not just the distro.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 13bde85f0067a751f775d31919705645ecc0a6d7)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 3c757b281bb623d9622c74143340fd892c8655ad
Component: packaging
 2018-09-04 12:43:44 -07:00
Tibor Vass 90b4f8c14c vendor buildkit to fix a couple of bugs 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit effa24bf48170f141cd9e1c1fcb5d39aedf1ca74)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 4c35d811471b80eec10476050b1222b653e6c5d9
Component: engine
 2018-09-04 15:52:24 +00:00
Tonis Tiigi d448ca1e85 builder: implement ref checker 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 354c241041ec67d4c500cccfda476dc73435d38e)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 28150fc70cc0688c63d27879bf1c701ade47caff
Component: engine
 2018-09-04 15:02:28 +00:00
Tibor Vass e376b78cb5 builder: fix pruning all cache 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit d47435a004e36531a594cd2636dddaff61a5f4d0)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: d2c316364225cd6bdf1581d11f370e0d159ad362
Component: engine
 2018-09-04 15:02:28 +00:00
Tibor Vass 5a73ccd4a8 builder: add prune options to the API 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8ff7847d1cf0f156b8a7cf1450aa944ef636c747)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3153708f13ceefc3e8e4d4a93778dcc9e4347f5a
Component: engine
 2018-09-04 15:02:28 +00:00