toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,185 Commits 3 Branches 295 Tags
95d730b7e2b5e2e85a9b2d46370556b7f6a0e01c
Commit Graph
42185 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 f8a31233fe Merge pull request #199 from dhiltgen/platform 
Wire up the platform string properly
Upstream-commit: 6ada8595287d6c25e9553b4aa36c961c5bc6f968
Component: packaging
 2018-09-12 14:59:32 +02:00
Eli Uriegas b18755d509 Add *.tar and image-linux to our gitignore 
A bit overdue

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 11643a30e0bdde4016afe42ab5f1f85e0fc83ecf)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: f38206fa477c59ec39b06b8ddde40be1f65c7cf0
Component: packaging
 2018-09-12 05:42:28 -07:00
Eli Uriegas 7589c6479b Have the tar target make a docker compat one too 
docker load doesn't support OCI based tar files so we have to make 2
different ones.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 696cdc009ca73b070d8877ee5cdd13c4b0e4a39b)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ea811c67ee1e558ecec1b394fc591458b57f7ed1
Component: packaging
 2018-09-12 05:42:28 -07:00
GordonTheTurtle f9341039de Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-12 08:36:54 +00:00
Vincent Demeester 1dd82b9047 Merge pull request #1364 from thaJeztah/18.09-backport_contains-containerized 
[18.09] backport: remove containerizedengine package dependency from docker/cli/command…
Upstream-commit: 5673816fec
Component: cli
 2018-09-12 08:55:12 +02:00
Daniel Hiltgen f36755c235 Wire up the platform string properly 
This is set in a top-level makefile, but apparently
isn't getting passed all the way through as expected.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: a5ad5471419cb2a0935148f891c5ada8b13b4779
Component: packaging
 2018-09-11 19:14:27 -07:00
GordonTheTurtle c1d5de1803 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-09-11 17:03:27 +00:00
docker-unir[bot] ce825751d7 Merge pull request #198 from jose-bigio/18.09_move_tar_targets 
Merged with https://github.com/seemethere/unir
Upstream-commit: 335dcd5851a58acc7415450fc28f9a47b94b4ac4
Component: packaging
 2018-09-11 16:37:57 +00:00
GordonTheTurtle 76d1f5bead Merge component 'cli' from git@github.com:docker/cli 18.09 2018-09-11 16:36:58 +00:00
Silvin Lubecki 9eec3ee5ff Merge pull request #1365 from thaJeztah/18.09-backport_engine-only-linux 
[18.09] backport add `docker engine` commands only on Linux…
Upstream-commit: a8c69c8287
Component: cli
 2018-09-11 18:04:57 +02:00
Jose Bigio 00ef8b90e6 Call the engine-.tar target 
Also cleans up the target in rpm and deb Makfiles because
the tar target already output a tar.

Signed-off-by: Jose Bigio <jose.bigio@docker.com>
(cherry picked from commit 8a4744f48aa13bea0b4e9174165be4add0a5a42f)
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 8e4a92dc667e2143b6d5707e19c5564b7da46ba1
Component: packaging
 2018-09-11 08:42:18 -07:00
Jose Bigio 92c32cb418 Move the tar creation to the image directory 
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
(cherry picked from commit eba0ed1f3497ebf25666d96c73c71fde9de98b50)
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 9398be8a7b9ea3907de5c112c329fe3ef1832137
Component: packaging
 2018-09-11 08:42:03 -07:00
Vincent Demeester 4c421251cb Remove containerizedengine package dependency from docker/cli/command… 
… this removes a whole lot of dependencies from people depending on docker/cli…

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 2d344b2f61)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fc3dc8f058
Component: cli
 2018-09-11 17:01:02 +02:00
Vincent Demeester 7c9cac74cd Add docker engine commands only on Linux… 
… this is, for now, the only platform that is supported

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit a3a955f204)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2a46a3d46c
Component: cli
 2018-09-11 16:57:54 +02:00
Jose Bigio f2500128b0 Merge pull request #557 from dhiltgen/fix_version 
Bump to beta1.2
 2018-09-10 16:48:31 -07:00
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
Daniel Hiltgen 251e48a733 Bump to beta1.2 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2018-09-10 08:18:45 -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