Commit Graph

48800 Commits

Author SHA1 Message Date
Alex Seymour b3ea302bb2
Fix SLES gpg url
The gpg key is in the top level directory for each distribution, using "${DOCKER_EE_URL}/sles/gpg" will attempt to load the gpg key from within the 12.3/<architecture>/<version>/ subdirectory, because of how DOCKER_EE_URL is set before.
2018-07-27 09:59:25 +02:00
Tammy Fox 17d66e0e6f
Merge pull request #7121 from yongshin/patch-1
Update release-notes.md
2018-07-27 01:01:22 -04:00
David Yu 63a09b4015
Update release-notes.md
Clean up release notes for 3.0.3
2018-07-26 21:57:13 -07:00
Tammy Fox 3f4ce14f3a
Merge pull request #7117 from tfoxnc/patch-release-07-2018
add relnotes for July patch release
2018-07-26 12:55:00 -04:00
tfoxnc 57611c3813 add relnotes for July patch release 2018-07-26 12:48:45 -04:00
Tammy Fox 3c502121f8
Merge pull request #7105 from ollypom/updatekubeingress
Update UCP Kube Ingress Controller Guide
2018-07-26 11:32:54 -04:00
Tammy Fox 14af2087d7
fix punctuation 2018-07-26 11:32:45 -04:00
Tammy Fox 99aeefcd10
Merge pull request #7114 from gtardif/release_notes_18.06.0-ce-win72
Release notes for 18.06.0-ce-win72 (Stable)
2018-07-26 11:28:43 -04:00
Jenkins-pr-release-docs ebf9c5d54d Docker for win stable relnotes 18.06.0-ce-win72
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-07-26 16:47:20 +02:00
Tammy Fox 84b21ddf3b
Merge pull request #7102 from axeal/patch-4
Update license purchase instructions
2018-07-26 00:55:20 -04:00
Tammy Fox 75d3d84c14
grammar fix 2018-07-26 00:55:08 -04:00
Tammy Fox cdf782e688
Merge pull request #7111 from docker/tfoxnc-patch-1
remove depreciated and no-longer-supported versions from list
2018-07-26 00:45:22 -04:00
Tammy Fox 03940b665d
Merge pull request #7024 from andrewhsu/cap
change inspectDockerimage to inspectDockerImage
2018-07-26 00:44:04 -04:00
Tammy Fox 50bdb51ce5
Merge branch 'master' into cap 2018-07-26 00:43:41 -04:00
Tammy Fox b279e95ff7
Merge pull request #7086 from shin-/compose-1.22.0
Add 1.21.x releases to release notes. Update latest Compose in config
2018-07-26 00:39:31 -04:00
Tammy Fox 1c51a02c27
Merge pull request #6985 from ericsmalling/patch-3
registries array is optional
2018-07-26 00:35:58 -04:00
Tammy Fox 4d1f07b9c0
Merge pull request #6974 from ivansharamok/master
extended docker engine uninstall instructions
2018-07-26 00:35:42 -04:00
Tammy Fox 9a0cb8c058
Merge pull request #6975 from sascha-egerer/patch-4
Fix copy and paste error
2018-07-26 00:35:28 -04:00
Tammy Fox 3e1f539c30
Merge pull request #7110 from tfoxnc/add-comp-matrix-link
Add comp matrix link
2018-07-26 00:32:53 -04:00
Tammy Fox 8c2b40aaea
Merge pull request #7109 from tfoxnc/win-script-install
add back Win script install section
2018-07-26 00:32:22 -04:00
Tammy Fox 6c091a21c1
remove depreciated and no-longer-supported versions 2018-07-25 23:38:30 -04:00
tfoxnc d6ee23cdda link to comp matrix instead of listing OSes 2018-07-25 23:31:12 -04:00
Tammy Fox b53ae17cb8
Merge pull request #7084 from gforghetti/patch-10
Update certify-plugins-logging.md
2018-07-25 22:43:17 -04:00
Tammy Fox f70567b63b
Merge pull request #7014 from gforghetti/patch-9
Update certify-plugins-logging.md
2018-07-25 22:42:15 -04:00
Tammy Fox 8ffc0d768e
editorial review 2018-07-25 22:42:00 -04:00
Tammy Fox 6f36433a10
Merge pull request #7013 from gforghetti/patch-8
Update certify-images.md
2018-07-25 22:40:33 -04:00
Tammy Fox 62bbead2ae
editorial review 2018-07-25 22:40:23 -04:00
Tammy Fox 9e48db5e03
Merge pull request #7106 from axeal/patch-5
Correct minor typo in --pod-cidr description
2018-07-25 15:58:22 -04:00
Tammy Fox 20c4e3808f
remove extra word 2018-07-25 15:57:50 -04:00
tfoxnc c7247fad27 Merge branch 'master' of github.com:tfoxnc/docker.github.io 2018-07-25 15:56:01 -04:00
Tammy Fox 914c9f4b4d
Merge pull request #7100 from gtardif/release_notes_18.06.0-ce-mac70
Release notes for 18.06.0-ce-mac70 (Stable) cc @gbarr01
2018-07-25 15:08:37 -04:00
Tammy Fox 20e371606d
Merge pull request #7101 from gtardif/release_notes_18.06.0-ce-win70
Release notes for 18.06.0-ce-win70 (Stable) cc @gbarr01
2018-07-25 15:08:24 -04:00
Tammy Fox df818444f2
Merge pull request #7099 from gtardif/release_notes_18.06.0-ce-win69
Release notes for 18.06.0-ce-win69 (Edge) cc @gbarr01
2018-07-25 15:07:00 -04:00
Tammy Fox a994a9300c
Merge pull request #7098 from gtardif/release_notes_18.06.0-ce-mac69
Release notes for 18.06.0-ce-mac69 (Edge) cc @gbarr01
2018-07-25 15:06:07 -04:00
Alex Seymour e616be2fbb
Correct minor typo in --pod-cidr description 2018-07-25 17:02:10 +02:00
ollypom 5d2a96202e Correct Seccomp placement
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-07-25 15:33:14 +01:00
ollypom 2a05cf370f Update Grant, Add SecComp profile and Update Ingress Image
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-07-25 15:09:52 +01:00
Alex Seymour 9bad7e0187
Update license purchase instructions
Update 'License your installation' to call out requirement for a standard or advanced subscription for UCP
2018-07-25 14:17:46 +02:00
Jenkins-pr-release-docs 5ec623faad Docker for win stable relnotes 18.06.0-ce-win70
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-07-25 11:01:23 +00:00
Jenkins-pr-release-docs 0cef8a3a98 Docker for mac stable relnotes 18.06.0-ce-mac70
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-07-25 10:59:26 +00:00
Jenkins-pr-release-docs 5298851009 Docker for win edge relnotes 18.06.0-ce-win69
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-07-25 10:58:21 +00:00
Jenkins-pr-release-docs e40676ac73 Docker for mac edge relnotes 18.06.0-ce-mac69
Signed-off-by: Jenkins-pr-release-docs <guillaume.tardif@docker.com>
2018-07-25 10:57:11 +00:00
Joffrey F afecc5aeea Add 1.21.x releases to release notes. Update latest Compose in config
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-23 11:54:01 -07:00
Gary Forghetti dd2a36ac99
Update certify-plugins-logging.md 2018-07-23 14:06:38 -04:00
Tammy Fox 146a8aebe1
Merge pull request #6954 from alecthegeek/patch-1
Fix broken link
2018-07-23 13:54:15 -04:00
Tammy Fox 499173c02f
Merge pull request #7083 from docker/tfoxnc-patch-1
grammar fix
2018-07-23 13:51:59 -04:00
Tammy Fox 668e404cea
grammar fix 2018-07-23 13:51:37 -04:00
Tammy Fox 7dd475734d
Merge pull request #7054 from albers/fix-download-link
Fix links on install page
2018-07-23 13:03:20 -04:00
Sebastiaan van Stijn f494d8b846
Merge pull request #7080 from ry4nz/revert-7073-ucp-3-0-3-relnotes
Revert "ucp relnotes for 3.0.3 and 2.2.11"
2018-07-23 17:12:58 +02:00
Ryan Zhang b20beb5dce
Revert "ucp relnotes for 3.0.3 and 2.2.11" 2018-07-23 07:46:39 -07:00