toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,243 Commits 3 Branches 295 Tags
9cdb2818ffb55fda53a975b251070369d7ce42dc
Commit Graph
42243 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 9cdb2818ff Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-19 01:02:50 +00:00
Andrew Hsu 43b6de9f82 Merge pull request #50 from AntaresS/cherry-pick-moby 
[18.09] backport propagate the dockerd cgroup-parent config to buildkitd
Upstream-commit: ea2e2c54272d906d527949c5635b95ac8e23b613
Component: engine
 2018-09-18 16:36:12 -07:00
GordonTheTurtle 418dc58053 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-18 21:03:32 +00:00
Eli Uriegas 33237214c7 Merge pull request #219 from seemethere/dynamic_compile_1809 
[18.09] Dynamically compile the docker daemon
Upstream-commit: 48b843941c1d913e7a55054783ca7c7a29dbd7d9
Component: packaging
 2018-09-18 13:44:37 -07:00
Eli Uriegas 8647a399e2 Dynamically compile the docker daemon 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4f18a1969510930b98b4ad4375297ea4db3298f3)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5e9cc984546917e2129e7601e329d9ce085d1e7e
Component: packaging
 2018-09-18 13:30:21 -07:00
Anda Xu 97c18c02cb create newBuildKit function separately in daemon_unix.go and daemon_windows.go for cross platform build 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 66ac92cdc65be350ec53f1de51052374846dfe24)
Upstream-commit: a5d731edecc75927f602c7f15e5ba9f5f77d3655
Component: engine
 2018-09-18 11:19:51 -07:00
GordonTheTurtle 4a973bddb1 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-18 01:03:19 +00:00
Eli Uriegas f7b24aae90 Merge pull request #216 from seemethere/add_devicemapper_1809 
[18.09] Add native rpm compilation for devicemapper
Upstream-commit: b7286dfc6457073f6988fbda86ea7e4ee0fd1ce6
Component: packaging
 2018-09-18 02:40:00 +02:00
Eli Uriegas 3c71b9d6ac Add native rpm compilation for devicemapper 
devicemapper cannot be enabled on a statically compiled binary so we
dynamically compile it on a rhel based distribution in order to enable
devicemapper usage.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 7cb8d358947974abae3e3c346b09523904030609)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c80ac56dfa393c405c2cd33af94ad6ac1366ece2
Component: packaging
 2018-09-17 16:50:09 -07:00
GordonTheTurtle eda0ddc2a8 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-17 21:04:28 +00:00
GordonTheTurtle e1e02bf4ba Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-17 21:04:18 +00:00
Tibor Vass 39a15def6d Merge pull request #55 from thaJeztah/18.09_backport_fix-progress-panic 
[18.09] backport pkg/progress: work around closing closed channel panic
Upstream-commit: c24fd7a2c3e4381010f1039d6a4cfa35f635d074
Component: engine
 2018-09-17 11:43:41 -07:00
docker-unir[bot] 7ed21517c2 Merge pull request #214 from seemethere/iptables_fix_1809 
Merged with https://github.com/seemethere/unir
Upstream-commit: 6dada46805e14da118eca74052734f4caa35503f
Component: packaging
 2018-09-17 17:24:00 +00:00
Eli Uriegas 954ee90b32 Add /usr/sbin to our path variable for systemd 
iptables is sometimes placed in `/usr/sbin`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit c86a958d6d344d6bf568523c28d6643d7b49ba43)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 36a08784a0b7bc49487005d323bf4e41fd50d36d
Component: packaging
 2018-09-17 10:20:34 -07:00
GordonTheTurtle 4ec08ba334 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-17 13:02:03 +00:00
Sebastiaan van Stijn f59ff81d45 Merge pull request #53 from thaJeztah/18.09_backport_buildkit-cli-control 
[18.09] backport always hornor client side to choose which builder to use with DOCKER_…
Upstream-commit: 5fb0a7ced7bcdb9e86e048fe3b24d0d4297d6155
Component: engine
 2018-09-17 12:34:28 +02:00
Tibor Vass 27a6fe5146 pkg/progress: work around closing closed channel panic 
I could not reproduce the panic in #37735, so here's a bandaid.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 7dac70324d0ce6acd23458b0bef06f099837d648)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c26eac56628527ed64c79ce9145ed97583cbeca
Component: engine
 2018-09-17 12:28:09 +02:00
Jose Bigio d3c8a2bd75 Merge pull request #558 from corbin-coleman/bump-version-18.09.0-beta1.3 
[18.09] Bump VERSION to 18.09.0-beta1.3
 2018-09-14 13:14:55 -07:00
corbin-coleman 48f8e34e5a Bump VERSION to 18.09.0-beta1.3 
Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
 2018-09-14 19:07:09 +00:00
GordonTheTurtle 68d223924d Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-14 16:37:05 +00:00
Anda Xu 815b828ddb always hornor client side to choose which builder to use with DOCKER_BUILDKIT env var regardless the server setup 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 5d931705e33927ba9f0b7251b74b6b3c450edaf6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5badfb40ebf1877bb319af3892b32a78491fb8e8
Component: engine
 2018-09-14 17:29:47 +02:00
Silvin Lubecki 4ba612a68b Merge pull request #1375 from thaJeztah/18.09_backport_importlcow 
[18.09] backport LCOW: --platform on import (already in API)
Upstream-commit: 78c42cf031
Component: cli
 2018-09-14 15:06:21 +02:00
GordonTheTurtle c1d70aac1f Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-14 12:36:55 +00:00
John Howard a59415a939 LCOW: --platform on import (already in API) 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b55a0b681f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dd2f13bed4
Component: cli
 2018-09-14 14:26:39 +02:00
Silvin Lubecki d660c7046d Merge pull request #1373 from thaJeztah/18.09_backport_move_test_function_in_there 
[18.09] backport getEngineConfigFilePath is only used during test so moving it in test files for now.
Upstream-commit: 3b991ec615
Component: cli
 2018-09-14 13:20:12 +02:00
Sebastiaan van Stijn b7897f6e93 Merge pull request #1374 from thaJeztah/18.09_backport_docs_fixes 
[18.09] backport update usage for 'docker build' with '--progress' and '--secret' options
Upstream-commit: 34ea8bb5a5
Component: cli
 2018-09-14 12:55:50 +02:00
Anda Xu 4a4ca3a409 update usage for 'docker build' with '--progress' and '--secret' options 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 83ca55db7d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: afb17ec70b
Component: cli
 2018-09-14 12:35:22 +02:00
Vincent Demeester c13580aaef getEngineConfigFilePath is only used during test… 
… so moving it in test files for now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 37ca5d6813)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 62aed95bc1
Component: cli
 2018-09-14 12:27:13 +02:00
Anda Xu 15caa5031e update vendor 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 54b3af4c7d7d625b9cff6d5d7b8730ec99f38977)
Upstream-commit: ee40a9ebcda2f46ea731ac1e2f840a2a23be0a07
Component: engine
 2018-09-13 16:42:13 -07:00
Anda Xu d0654cc902 propagate the dockerd cgroup-parent config to buildkitd 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit d52485c2f901e62e9a26445e230ec3f6662fa276)
Upstream-commit: e8620110fcbfca840e91bfb06348da8d9fd53e2e
Component: engine
 2018-09-13 16:36:57 -07:00
GordonTheTurtle 6d339734f7 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-13 21:00:48 +00:00
docker-unir[bot] bba2d5fcd5 Merge pull request #211 from andrewhsu/aufs 
Merged with https://github.com/seemethere/unir
Upstream-commit: 0285849e90e7a1216b4c79670a8893b5f46e89ff
Component: packaging
 2018-09-13 20:32:44 +00:00
Andrew Hsu a29a2ca481 type fix on deb package recommends aufs-tools 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 18a9c4921b0b185dea5873326df5ecaa2618b355
Component: packaging
 2018-09-13 18:41:31 +00:00
GordonTheTurtle 09a225d195 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-13 13:03:45 +00:00
GordonTheTurtle f27fe9ca16 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-09-13 13:03:35 +00:00
GordonTheTurtle cd5bd70aa4 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-13 12:37:02 +00:00
Eli Uriegas 5b21e6bfde Merge pull request #209 from kolyshkin/18.09-fix-seccomp 
[18.09] image/Dockerfile: add osusergo, seccomp tags
Upstream-commit: 283db28dde5ddba8ba421240535318cb19b1df3f
Component: packaging
 2018-09-13 12:14:05 +02:00
Silvin Lubecki 017b0f6ba8 Merge pull request #1368 from thaJeztah/carry-1360-store_prefix 
[18.09] Prefix engine repo with store
Upstream-commit: 649e4916bb
Component: cli
 2018-09-13 08:24:45 +02:00
Kirill Kolyshkin ac99566390 image/Dockerfile: add osusergo, seccomp tags 
osusergo build tag is needed for better chances to have
a proper static binary when Go >= 1.11 is used, and is
harmless otherwise.

seccomp build tag is needed so the resulting dockerd binary
has seccomp support.

[v2: add libseccomp-dev installation]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 97596405f4300a7ae6eb7664f6c58785955dd8d3
Component: packaging
 2018-09-12 19:34:45 -07:00
Andrew Hsu ea3c2e02fc Merge pull request #46 from kolyshkin/18.09-backport-pr37771 
[18.09] backport #37771 "vendor: update tar-split"
Upstream-commit: e9880018722a325a34290130255a820fff1779fa
Component: engine
 2018-09-12 18:16:16 -07:00
Andrew Hsu b8bac33848 Merge pull request #48 from kolyshkin/18.09-backport-logs-follow 
[18.09] backport "daemon.ContainerLogs(): fix resource leak on follow"
Upstream-commit: 6531bac59bfd453456231511bdc3efade1fc9481
Component: engine
 2018-09-12 18:13:56 -07:00
GordonTheTurtle f730722787 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-12 17:06:55 +00:00
Eli Uriegas 1cc5cccebc Merge pull request #207 from seemethere/do_not_include_arch_1809 
[18.09] Remove the arch in the image tag
Upstream-commit: 4246e237d47800b5a13904acbc789fd4555885b0
Component: packaging
 2018-09-12 16:28:07 +02:00
Eli Uriegas 434a8b60cc Remove the arch in the image tag 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit f7b0d0742e4b23e3442ce78cbc0d4c190929eb96)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 0fb14f8b914ada119d74818637e4a13176a51410
Component: packaging
 2018-09-12 07:19:27 -07:00
Eli Uriegas 75470dbe47 Merge pull request #206 from seemethere/remove_need_for_suffix_1809 
[18.09] Remove need for SUFFIX in gen-deb-ver
Upstream-commit: 798d4cc8c5c1caf51632fa1da967725414e37b73
Component: packaging
 2018-09-12 15:20:36 +02:00
Eli Uriegas 21ad97749e Merge pull request #205 from seemethere/bump_containerd_proxy_1809 
[18.09] Bump proxy to 35c543b
Upstream-commit: d3176d845cd14b033ab3b8d65e587b6af18ed6bf
Component: packaging
 2018-09-12 15:13:52 +02:00
Eli Uriegas 1b98ea2057 Remove need for SUFFIX in gen-deb-ver 
Should generate correct bits whether or not the suffix is present.

Working example:

❯ ./gen-deb-ver . 18.09.0-beta1
18.09.0~1.1.beta1 18.09.0-beta1

❯ ./gen-deb-ver . 18.09.0-ce-beta1
18.09.0~ce~1.1.beta1 18.09.0-ce-beta1

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 9de3f6fb573806abc2e546447c41552ff90731a4)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: cc336d0804076b31d6d059b164e9b4e3b3cec886
Component: packaging
 2018-09-12 06:03:56 -07:00
GordonTheTurtle 95d730b7e2 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-12 13:03:33 +00:00
Eli Uriegas ffcd2e38d1 Merge pull request #203 from seemethere/fix_tar_1809 
[18.09] Have the tar target make a docker compat one too
Upstream-commit: 098761f13254bf956a92ebca219aa10b69b8e7d9
Component: packaging
 2018-09-12 15:02:49 +02:00
Eli Uriegas 1ba2a2621f Bump proxy to 35c543b 
Includes fixes related to upgrade cycles

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 83a20d53f14adcd2bcc9e932435aa66b6e056afa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: befa3c61954d12f2413df56a384989d7ae2cb9b3
Component: packaging
 2018-09-12 06:00:21 -07:00