Alexander Morozov
e2d541585f
Merge pull request #30067 from tophj-ibm/add-more-detailed-install-script-message
...
add suggestions in failure message in install script
(cherry picked from commit 002312d6c1
2017-04-07 11:20:35 +02:00
Vincent Demeester
8de0ced471
Merge pull request #32425 from tabakhase/patch-1
...
Fix install.sh of get.docker.com for debian-sudo
(cherry picked from commit daaf9ddfa9
2017-04-07 11:15:49 +02:00
Michael Crosby
af72a358fc
Merge pull request #29967 from justincormack/gpg-include-keys
...
Do not use keyservers to fetch GPG keys for apt
(cherry picked from commit 518945b6bd
2017-04-07 11:15:41 +02:00
Vincent Demeester
99d1e7f5b6
Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group
...
Don't encourage adding user to docker group
(cherry picked from commit 06e3812b6e
2017-04-07 11:11:17 +02:00
Vincent Demeester
8e45d27673
Merge pull request #32191 from tiborvass/yaml-docs-gen-17_03
...
[17.03] docs: added support for CLI yaml file generation
2017-04-03 17:04:38 +02:00
Victor Vieux
f89896dd09
install: map debian_version 9.X to debian stretch without lsb_release
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit f8360d002d
2017-03-29 13:46:37 -07:00
French Ben
43e3b8d2cc
docs: added support for CLI yaml file generation
...
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 5443f0152f
2017-03-28 17:41:46 -07:00
Kenfe-Mickael Laventure
00132cc442
Update containerd to version 4ab9917febca54791c5f071a9d1f404867857fcc
...
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-15 08:16:07 -07:00
Kenfe-Mickael Laventure
74c52a7bab
Update containerd to 595e75c212d19a81d2b808a518fe1afc1391dad5
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-09 13:50:28 -08:00
Victor Vieux
e0cff8e193
Merge pull request #31653 from dnephin/fix-compose-bindata
...
[17.03.x] Fix the generated bindata in the release branch
2017-03-09 13:23:59 -08:00
Kenfe-Mickael Laventure
030f7b370f
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-03-08 14:49:32 -08:00
Daniel Nephin
2a60fc01ab
Fix the generatd bindata in the release branch.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-08 10:20:23 -05:00
Kenfe-Mickael Laventure
e285c70dec
Bump runc to a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-02-23 01:05:38 -08:00
Victor Vieux
d06b03a99d
Merge pull request #31274 from tonistiigi/update-containerd
...
[17.03.x] vendor: update containerd to 977c511ed
2017-02-22 19:38:23 -08:00
Victor Vieux
44aec1b692
add -ce support
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-22 17:38:37 -08:00
Tonis Tiigi
c7f67ed835
vendor: update containerd to 977c511ed
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-22 16:04:23 -08:00
Kenfe-Mickaël Laventure
3804b6d408
Merge pull request #30391 from andrewhsu/check-changelog-date
...
validate CHANGELOG.md dates are in descending order
(cherry picked from commit 5e74dc11e3
2017-02-23 00:38:39 +01:00
Vincent Demeester
39781f92b3
Merge pull request #29208 from andrewhsu/validate-changelog
...
validate CHANGELOG.md is well-formed
(cherry picked from commit 59ba895a0f
2017-02-23 00:37:43 +01:00
Vincent Demeester
fbc84e24aa
Merge pull request #30646 from vieux/1.13.1-rc2-cherrypicks-2
...
1.13.1 rc2 cherrypicks 2
2017-02-02 11:31:19 +01:00
Sebastiaan van Stijn
553d56d456
install dirmngr if needed
...
as of Ubuntu Yakkety, dirmngr is now in a separate
package (see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464 )
this patch updates the install script to install
the dirmngr package if it's not installed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f5263c8074
2017-02-01 17:26:26 -08:00
Sebastiaan van Stijn
d00e249c26
[1.13.x] bump RunC / libcontainer to fix SELinux regression
...
This bumps RunC and libcontainer to fix a regression
in 1.13 that caused SELinux labels to not be
applied correctly.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-02-01 12:27:00 -08:00
Kenfe-Mickael Laventure
0311ed7b1c
Update containerd to version aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-01-31 15:01:55 -08:00
Felix Abecassis
10d999d7ab
install: map debian_version 9.X to debian stretch
...
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
(cherry picked from commit ac3d74b0b4
2017-01-31 12:54:34 -08:00
Victor Vieux
1b05e7aee7
Merge pull request #30331 from vieux/1.13.1-rc1-cherrypicks
...
1.13.1 rc1 cherrypicks
2017-01-26 19:21:38 -08:00
Daniel Nephin
7f396e8ea3
Update Compose schema to match docker-compose.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:05 -05:00
Daniel Nephin
d9bda3080a
Add validation for compose schema bindata.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:43:05 -05:00
Daniel Nephin
5bf7901f5d
Replace vendor of aanand/compose-file with a local copy.
...
Add go-bindata for including the schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-25 16:04:05 -05:00
Elan Ruusamäe
2dd2ac2c14
do not require custom build of tini
...
https://github.com/krallin/tini/issues/55#issuecomment-260507562
https://github.com/krallin/tini/issues/55#issuecomment-260538243
https://github.com/docker/docker/pull/28037
Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
(cherry picked from commit d7df731597
2017-01-24 16:31:39 -08:00
Tonis Tiigi
acbad31dcd
vendor: update runc to 2f7393a4
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-01-10 18:07:20 -08:00
Brian Goff
464b205956
Fix conflicts with newly updated selinux policies
...
The base selinux policies on centos/rhel/oraclelinux have all been
updated in a way that conflicts with the policies we install with
`docker-engine-selinux`. This patch fixes these conflicts.
In addition, removes special cases for old/unsupported versions of
fedora in our selinux package, and change to use a single minimum
version for the selinux base policy package, as this is the minimum
version required to use our selinux policy package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ec9a05e5e2
2017-01-06 16:04:59 -05:00
Sebastiaan van Stijn
7cbc4cb7f2
fix powershell dco check
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 611a633ba4
2017-01-04 12:42:42 +01:00
John Howard
b18516e6ac
Windows: make.ps1 fix DCO check
...
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit e538c1fdca
2016-12-09 14:20:25 -08:00
Michael Friis
6e08e2edcf
remove bonus whitespace
...
Signed-off-by: Michael Friis <friism@gmail.com>
(cherry picked from commit 8d47858f96
2016-12-09 14:20:00 -08:00
Sebastiaan van Stijn
c027e4a861
remove unsupported distros from install script
...
The install script currently includes some
distros that we don't actually have packages
for.
For these distros, the script currently
performs step to install Docker from
the distro's repository.
This patch removes those distros from
the install script, because we have no
control over these packages, and cannot
provide support for them.
Installing docker anyway will give the
false impression that they installed
a package from our repository (but they
didn't), and that they need to contact
us for support.
It's better to tell people that we don't
install in that case, and refer them to
the installation documentation, or the
documentation of their distro.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 29b98b6ee6
2016-12-09 14:17:25 -08:00
Antonio Murdaca
6c8bd56007
hack/make.sh: fix BUILDTIME
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 7b1f77dcbc
2016-12-07 16:20:38 -08:00
John Howard
540758ee99
Windows: make.ps1 Throw exception on failure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 8c22a00b77
2016-12-07 16:15:01 -08:00
John Howard
e509501437
Windows: make.ps1 and Dockerfile for native builds
...
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 155435b6ce
2016-12-02 16:54:05 -08:00
Daniel Nephin
8f961397f4
Fix swagger-gen validation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit f247a99c6d
2016-12-02 13:44:34 -08:00
John Howard
f9f8a94f42
Windows: Native autogen
...
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 64cc7677bf
2016-11-22 18:40:19 -08:00
Antonio Murdaca
54518a214d
hack/dockerfile/binaries-commits: use full commit hash for docker info
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit fa15d5ed0f
2016-11-22 16:19:18 -08:00
Andrew Hsu
3168635120
skip solaris and allow dry run control points
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f60541069c
2016-11-22 11:27:01 -08:00
Anusha Ragunathan
0403addc5f
Add HTTP client timeout.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 83ca993c15
2016-11-22 11:23:20 -08:00
Victor Vieux
8e21480106
skip api/types/container/ (like golint) and fix one pkg
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit 79a891efb7
2016-11-18 18:41:43 -08:00
Kenfe-Mickael Laventure
47ccfcc09f
Update containerd & runc
...
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 8b1aeb22fe
2016-11-18 15:15:19 -08:00
Aaron Lehmann
d4392659f7
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 948e60691e
2016-11-18 13:57:11 -08:00
Vincent Demeester
51dc584445
Update Tini to fix photon build-rpm compilation errors
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-18 13:29:20 -08:00
Victor Vieux
44bb0bb7f2
update tini to a87614212b3a51a9cad57ff7989103a841546745
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-16 11:11:22 -08:00
Kenfe-Mickael Laventure
70e7fcc595
Remove extra binaries commit variables from windows build
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-14 11:52:45 -08:00
Victor Vieux
0427afa409
Merge pull request #27955 from mlaventure/runc-docker-info
...
Add external binaries version to docker info
2016-11-10 21:27:14 -08:00
Sebastiaan van Stijn
c4f1cb7791
Add Fedora 25 RPMs
...
This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.
Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule
Once released, the image will be updated for
GA
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-10 20:44:30 +01:00
