toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
332 Commits 3 Branches 295 Tags
2b581132c741f81ff5004449efdc819901746269
Commit Graph
332 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
docker-unir[bot] 7ee4f65588 Merge pull request #176 from dhiltgen/oci_labels 
Merged with https://github.com/seemethere/unir
Upstream-commit: e1bdbd889d78fe776404174b2170c7db256ee220
Component: packaging
 2018-08-31 20:46:38 +00:00
Daniel Hiltgen b6f361cd3a Add standard OCI labels 
This adds the standardized OCI labels for our image so downstream tools
will be able to inspect/extract these mechanically.

Reference: https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 58e5b9c98134930c00ad678bc0de454b490dd7b6
Component: packaging
 2018-08-29 10:27:51 -07:00
Andrew Hsu e93312430e Merge pull request #173 from andrewhsu/se 
[18.09] add requires container-selinux to spec
Upstream-commit: 3e1fd2ba5b9aaf19eff1880092c165e96e42a13a
Component: packaging
 2018-08-28 22:12:02 -07:00
Andrew Hsu 39bc439e8b add requires container-selinux to spec 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: e4b1c10a6b99b875cd5e37bbfef0b9a6ce58a518
Component: packaging
 2018-08-29 04:23:49 +00:00
Andrew Hsu fc6d931f21 Merge pull request #172 from dhiltgen/seccomp_dep 
[18.09] Add explicit dependency for libseccomp2
Upstream-commit: f0a0c5acba3f6bb7285853f44a17ecd5d4638219
Component: packaging
 2018-08-28 21:06:40 -07:00
docker-unir[bot] 8a8398e8e4 Merge pull request #165 from dhiltgen/platform 
Merged with https://github.com/seemethere/unir
Upstream-commit: bb9b1d3c1cddaf58bdb83931a1f1e35f88b07fbc
Component: packaging
 2018-08-29 03:51:49 +00:00
Andrew Hsu ad82a267b6 Merge pull request #171 from andrewhsu/ps 
[18.09] Add post-stop
Upstream-commit: 66ad326a35cba7a1d8dd1be2b445e3bdff40d576
Component: packaging
 2018-08-28 17:41:35 -07:00
Daniel Hiltgen 3a6b03f884 Add explicit dependency for libseccomp2 
While testing on older ubuntu images we discovered
we do depend on a newer version of libseccomp2.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: f2ceca98823548e401c6cca125b7057df28c4892
Component: packaging
 2018-08-28 17:07:43 -07:00
Michael Crosby cc5399a50d Add post-stop 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 5f4b9c0eab3978e491ff249aacffb2338bf2408a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 89d78463660094d24878c9060d7ef45dddc7546b
Component: packaging
 2018-08-28 23:31:50 +00:00
docker-unir[bot] 95ea0f1d1a Merge pull request #170 from jose-bigio/bump_ubuntu_epoch 
Merged with https://github.com/seemethere/unir
Upstream-commit: e7ab731876d3f33c70d7d0767193920ffc30d986
Component: packaging
 2018-08-28 23:19:20 +00:00
Jose Bigio 85c6730591 Bump the epoch from 2 to 3 for deb packages 
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 4f3c49bc920bd125aeeea546d48c561f317c4c37
Component: packaging
 2018-08-28 13:27:01 -07:00
docker-unir[bot] 292dd4d5bd Merge pull request #167 from seemethere/suffix 
Merged with https://github.com/seemethere/unir
Upstream-commit: 080c2c5b30b2f1cd5997b1e03fd04d7ef1aebdd1
Component: packaging
 2018-08-28 20:21:38 +00:00
Eli Uriegas 40dd03795f Specify suffix for DEB_VERSION 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6c5b7fcb956871f7a44e1a478ad9450f9df4bed1
Component: packaging
 2018-08-28 17:24:58 +00:00
Daniel Hiltgen 4ca20bcd76 Add build date per upstream moby pattern 
This adds a build date using the same pattern as upstream
https://github.com/moby/moby/blob/master/hack/make.sh#L69

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: c443439189fdc40c012ef5ac6cf592d32f478b54
Component: packaging
 2018-08-24 17:19:51 -07:00
Daniel Hiltgen 12f331f6b2 Expose the platform string for community builds 
This encodes the platform as "Docker Engine - Community"
for community engines

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 4d9fd7d17f3aab3463baf6030072f5789a003a74
Component: packaging
 2018-08-24 17:05:42 -07:00
Andrew Hsu 90b540baa9 Merge pull request #164 from andrewhsu/rsec 
[18.09] added RestartSec
Upstream-commit: e551ce432933cc841103688852390768c2eeda0d
Component: packaging
 2018-08-24 15:45:36 -07:00
Andrew Hsu 3e2da1ea70 added RestartSec 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3614f5dc4eb20e0d028ee1b2fd4bc23d34815f39
Component: packaging
 2018-08-24 22:40:02 +00:00
Andrew Hsu 8f960d9901 Merge pull request #162 from andrewhsu/cprox 
[18.09] update containerd proxy commit to afca176
Upstream-commit: ad501c8f80636b3446db0a15d6a9da8ccfd65ccd
Component: packaging
 2018-08-24 15:19:12 -07:00
Andrew Hsu 546163ada0 update containerd proxy commit to afca176 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: eea6967f5de4835800349b1bcf2b81de8fd92207
Component: packaging
 2018-08-24 22:14:20 +00:00
Eli Uriegas bcac5c18d0 Merge pull request #160 from dhiltgen/fix_scope 
[18.09] Make engine scope a build time setting
Upstream-commit: 4a425676ac9183011f84fafda1a103fe93121dd1
Component: packaging
 2018-08-24 12:01:27 -07:00
Daniel Hiltgen 66e16d32fe Make engine scope a build time setting 
This should make it easier to change downstream builds
to change the scope.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 72406691244c12d5360889f8658bd4989b588364
Component: packaging
 2018-08-24 11:40:42 -07:00
Eli Uriegas 5e417d9bd2 Merge pull request #158 from andrewhsu/ac 
[18.09] use systemctl is-active to check for containerd
Upstream-commit: 7e5cc1a95e11a48148f1972d625322ae1399c0bc
Component: packaging
 2018-08-23 09:59:48 -07:00
Andrew Hsu 51edf81efb use systemctl is-active to check for containerd 
The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f00df1bf1efa2ed1ea508ea7b1c291500441571d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a9b0387bb0f40bd7687d8653a0714724eb66f3b9
Component: packaging
 2018-08-23 16:57:41 +00:00
Eli Uriegas 97dd93e978 Merge pull request #157 from seemethere/remove_overlay_1809 
[18.09] Remove overlay as the default storage driver
Upstream-commit: 54dc76c596e5f5fe8ee76e65a0ac601f8a1d8e8b
Component: packaging
 2018-08-23 09:44:14 -07:00
Eli Uriegas dc460e810c Remove overlay as the default storage driver 
Should rely on list in the daemon

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 605758124d0750c14d24bfb1ebcf77d102591f4a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6cc81c2e8c95127baac275750bc544452fec7799
Component: packaging
 2018-08-23 16:39:44 +00:00
Eli Uriegas dbb89de17a Merge pull request #155 from seemethere/fix_up_dockerfile_1809 
[18.09] Fix up Dockerfile.engine to compile docker-proxy statically
Upstream-commit: 9162117ba4c76ad329c4c4abeab02b91e76cbd4c
Component: packaging
 2018-08-23 08:50:54 -07:00
Eli Uriegas 6c6bc2f8c9 Remove linux-headers as a dependency 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 82258262f90bfaca3a2ef14e6b53238c2fac3147
Component: packaging
 2018-08-23 15:08:24 +00:00
Eli Uriegas 45b43d2050 Wire up dependencies for debian, source -> . 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 99bbb6e33f46b6e2621204aac3b05344783ccfaa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3aeb8e9365fefea1be6e6b64624fccb81d5a70ad
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas adca33ea9c Fix whitespace, add Dockerfile.engine to clean 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 831482a3296e9a7b1ad10f6b8c850a7a4095b881)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ce1d295cf4f7049dc48813d825511a85ebf7e9c1
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas cea6d4e302 Make GO_IMAGE configurable, default to official go 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4cdbe08bf929d5c731b61e1cea217fa40156a3a8)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5bfb6ce9464fea13abc71fb6c12b9f5cb01a29a4
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas bd24fd7ae6 Merge pull request #148 from dhiltgen/license_message 
Set up default product license for community engines
Upstream-commit: 7195f2116059c01b3a4cc4314c345510d04a2feb
Component: packaging
 2018-08-21 11:15:36 -07:00
Eli Uriegas a16152031b Merge pull request #151 from docker/develop 
Merging the develop changes into master
Upstream-commit: a119f42ef86517dc79e0b3749acdb457a63dea6d
Component: packaging
 2018-08-21 11:15:07 -07:00
Daniel Hiltgen 06c4880d2c Set up default product license for community engines 
This will report a fixed string for community engines
Upstream-commit: 140dd867085cbe97947a64353fe245b858284172
Component: packaging
 2018-08-20 16:41:23 -07:00
Eli Uriegas 6536c488a2 Merge pull request #150 from seemethere/require 
Set containerd to be a systemd bind for docker
Upstream-commit: 710ecfcf0992363047d1f9bf57be20b7459ae0c7
Component: packaging
 2018-08-20 14:31:22 -07:00
Eli Uriegas dbc4cb6ea0 Set containerd to be a systemd bind for docker 
The daemon won't actually start without containerd

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 16037618282dc5076089c7b749cdd07376650f8d
Component: packaging
 2018-08-20 21:17:32 +00:00
Eli Uriegas ca4ed4129e Merge pull request #149 from seemethere/offline_engine 
Do offline bundles for engine installs
Upstream-commit: 99edae9143f8189a75aab661536c995d46c55231
Component: packaging
 2018-08-20 13:23:00 -07:00
Eli Uriegas b3c9a88509 Do offline bundles for engine installs 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: fe03039776edbc90053b510ae6e72657340b1ccb
Component: packaging
 2018-08-20 20:08:07 +00:00
Eli Uriegas d59e776158 Merge pull request #147 from seemethere/c 
Make ENGINE_IMAGE configurable for dockerd.json
Upstream-commit: 411a80222b89308419e138708cc2cfc7442721b7
Component: packaging
 2018-08-20 08:08:55 -07:00
Eli Uriegas 3f276a5ee3 Make ENGINE_IMAGE configurable for dockerd.json 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 657c7899302691373836bbd28fc4c069da64d90e
Component: packaging
 2018-08-20 14:59:56 +00:00
Eli Uriegas 6e4bcc873b Merge pull request #146 from seemethere/configurable 
Make IMAGE_TAG configurable for dockerd.json
Upstream-commit: e344a52260c8774a3de2a648d8b055e83d27b6f7
Component: packaging
 2018-08-18 14:50:04 -07:00
Eli Uriegas a59390fe70 Remove s390x for now 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 660431eec07bb7a934c483bb2355b9f121fb98e2
Component: packaging
 2018-08-18 21:49:50 +00:00
Eli Uriegas d0741cffba Make IMAGE_TAG configurable for dockerd.json 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: aabd5d3b852b3b3f7131cdd622a9e5078f193819
Component: packaging
 2018-08-18 21:27:35 +00:00
Eli Uriegas 0500a90795 Merge pull request #145 from seemethere/rpm_override 
Make the build variables eval at reference
Upstream-commit: 303a2454cdee1ba71caad664a1861e3386b01592
Component: packaging
 2018-08-17 14:39:38 -07:00
Eli Uriegas 82d8af2891 Make the build variables eval at reference 
Makes it so that you can overwrite them better if you include this
makefile in another makefile...

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 446f8d31394ae35fc38187aa5e40627b33a95a27
Component: packaging
 2018-08-17 21:22:05 +00:00
Eli Uriegas eacc99c223 Merge pull request #144 from seemethere/resilience 
Make the curl for containerd-proxy more resilient
Upstream-commit: 9e0c559930ad836e8926e1766bead587d9c6fa5b
Component: packaging
 2018-08-17 13:42:42 -07:00
Eli Uriegas 26a46ac890 Make the curl for containerd-proxy more resilient 
Was reporting 404's using the old url for some reason, might have to
refactor this in the future to just use a git clone...

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 763ad6aa7ac24c269dc1dfa223771671acffc8fc
Component: packaging
 2018-08-17 20:25:50 +00:00