Commit Graph

48790 Commits

Author SHA1 Message Date
Derrick Miller
2cb3fadb3b Update suse.md
In the **Install using the repository** section, the GPG implied location was identified as `<DOCKER-EE-URL>/sles/12.3/<ARCHITECTURE>/stable-<VERSION>/sles/gpg` which does not exist. The correct location is `<DOCKER-EE-URL>/sles/gpg`. I introduce a second variable here called `DOCKER_EE_BASE_URL` which will be used to distinguish between the root level of the directory and aid in correctly locating the gpg key for the `rpm --import` command.
2018-07-26 09:49:07 -04: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
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
Tammy Fox
5f2d15f69e Merge pull request #7058 from gtardif/release_notes_18.06.0-ce-rc3-win68
Release notes for 18.06.0-ce-rc3-win68 (Edge) cc @gbarr01
2018-07-22 20:01:50 -04:00
Tammy Fox
2d4c40351e Merge pull request #7057 from gtardif/release_notes_18.06.0-ce-rc3-mac68
Release notes for 18.06.0-ce-rc3-mac68 (Edge) cc @gbarr01
2018-07-22 20:01:26 -04:00
Tammy Fox
fe09ff790d Merge pull request #7073 from docker/ucp-3-0-3-relnotes
ucp relnotes for 3.0.3 and 2.2.11
2018-07-22 19:58:55 -04:00
Tammy Fox
f98ef57593 Merge pull request #7072 from docker/18-03-relnotes
Update relnotes per issue #7053
2018-07-22 18:30:56 -04:00
Tammy Fox
eadcd74e0a add ucp relnotes for 2.2.11 2018-07-22 18:28:00 -04:00
Tammy Fox
f5b0e4ff0e Update release-notes.md 2018-07-22 18:17:50 -04:00
Tammy Fox
2cb62677b8 Update release-notes.md 2018-07-22 18:11:56 -04:00
Tammy Fox
cf3b4e4984 Merge pull request #6998 from ollypom/kuberbacprivilegedcontainers
UCP Kube RBAC Privileges adjusted for Changes in 3.0.2
2018-07-19 22:41:43 -04:00
Tammy Fox
3c24fceb0e Merge pull request #6988 from ollypom/offlineinstallationbundles
Seperate 2016 and 1709 offline bundles for UCP
2018-07-19 22:38:13 -04:00
Tammy Fox
fe5be816d5 Merge pull request #7065 from docker/edge-to-nightly
Edge has been deprecated in favor of nightly channel
2018-07-19 16:38:20 -04:00