toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
407 Commits 3 Branches 295 Tags
2078498ea13d0f3e23625d623e441548a46f3a75
Commit Graph
407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eli Uriegas 2078498ea1 Merge pull request #252 from thaJeztah/18.09_backport_notify 
[18.09 backport] Restore `Type=notify` in Systemd unit
Upstream-commit: 50b5361dabe74c9511ad41586461415d021e7b93
Component: packaging
 2018-10-18 09:29:55 -07:00
Valentin Kulesh f88793e75f Restore Type=notify in Systemd unit 
Signed-off-by: Valentin Kulesh <valentin.kulesh@virtuozzo.com>
(cherry picked from commit 221b152fde996db4c7571c37f8b934db7f5dda49)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ea2b2cdae5f6eab1bd99d6a79904093bcf8569ea
Component: packaging
 2018-10-18 17:14:52 +02:00
docker-unir[bot] 199a80226e Merge pull request #247 from dhiltgen/buildtime 
Merged with https://github.com/seemethere/unir
Upstream-commit: 4756a2fba881a2240298b682703203c3768a76dc
Component: packaging
 2018-10-02 22:42:06 +00:00
Daniel Hiltgen f18c1e0a00 Make sure buildtime is always set 
This should ensure we don't produce builds without a valid "Built:"
field in the the version payload.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 9a071a3fbe316ea6d70bc1a5111cbe14ae99aec9
Component: packaging
 2018-10-02 10:01:45 -07:00
Eli Uriegas 98e8058b66 Merge pull request #246 from seemethere/metadata_1809 
[18.09] Change metadata to be stored in docker-engine
Upstream-commit: 52bc21044c636f7ffcacf5fff5f74e10ab1b6761
Component: packaging
 2018-09-28 14:23:25 -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 23ba2a13ef Change metadata to be stored in docker-engine 
People blow away `/var/lib/docker` all the time so we probably shouldn't
store important data there.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 9391057c9472ba24049b8645c251a4c63894522f)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 865140fc4155481b20f694a4528e04e48eb76de4
Component: packaging
 2018-09-26 22:33:01 +00: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
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
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 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
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
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
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
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
Sebastiaan van Stijn eb465533d3 more updates to package descriptions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: eb89f3ebd68033fe49b12016ad07f28cfc33d874
Component: packaging
 2018-09-20 12:42:43 +02:00
Sebastiaan van Stijn 4827d551d2 change some wording in package description 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1a3379642fb37457d0249ae99385d17ddc85a6af)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 56bed5f33d75bf297c8f3c2018a34aaa30cfe9da
Component: packaging
 2018-09-20 12:34:01 +02:00
Sebastiaan van Stijn 1456fda3ec change home page link for deb pkgs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a4df8fe1f86f38ad935862eb188b6fc234d22793)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 702f6a07fccef45343368895d105bb3e79ad2339
Component: packaging
 2018-09-20 12:33:54 +02:00
docker-unir[bot] bb0dd83bce Merge pull request #220 from seemethere/configurable_1809 
Merged with https://github.com/seemethere/unir
Upstream-commit: 24d48340b743436ebf90ef3b18522348d1fe3e16
Component: packaging
 2018-09-19 00:01:01 +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 1b4f5d412e Make base for Dockerfile.engine-dm configurable 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 605df1abcb4c432ebb1b73c29bfa0d5d3d48c0ce)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 7df6db6ac3b71c0a41fc2792e5778e2566b72399
Component: packaging
 2018-09-18 13:34:12 -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
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
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
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
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
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
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
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