Commit Graph

52089 Commits

Author SHA1 Message Date
Maria Bermudez be2f4587d6
Merge pull request #8567 from vsocrates/patch-1
Include Ubuntu version in Dockerfile
2019-04-08 08:08:56 -04:00
Maria Bermudez 550a9f6009
Merge pull request #8606 from avranju/patch-1
Remove redundant "be"
2019-04-08 07:42:49 -04:00
Maria Bermudez 68068e602f
Merge pull request #8513 from adamancini/patch-13
Update install.md
2019-04-08 07:39:22 -04:00
Maria Bermudez bfe38f1dad
Add UCP user password limitation 2019-04-08 04:38:59 -07:00
Divyam Bhasin afaf74c1ec
Update the "role-based access control" link
On page "https://docs.docker.com/ee/ucp/user-access/", update the hyperlink "role-based access control" to point to "https://docs.docker.com/ee/ucp/authorization/" instead of "https://docs.docker.com/ee/access-control".
2019-04-07 11:40:01 -04:00
Rajasekharan Vengalil a43165a37c
Remove redundant "be" 2019-04-06 13:57:06 -07:00
Maria Bermudez 2ff6cc02af Merge branch 'master' of github.com:docker/docker.github.io 2019-04-04 18:10:09 -07:00
Maria Bermudez 712a23e1b4
Merge pull request #8600 from docker/master
Sync published with master
2019-04-04 20:42:27 -04:00
paigehargrave 2398cd9dca
Merge pull request #8580 from bermudezmt/dtr-storage-backend
Storage backend data migration updates
2019-04-04 20:41:32 -04:00
paigehargrave a7793edc74
Netlify redirects interlock (#8595)
* Added netlify redirect
2019-04-04 19:45:46 -04:00
Maria Bermudez 603b14f1f0 Addressed engineering feedback 2019-04-04 16:18:40 -07:00
Maria Bermudez 1f91b7c86a
Merge pull request #8586 from cdunkelb/patch-7
--unmanaged-cni is not a valid option for upgrade
2019-04-04 18:35:26 -04:00
Maria Bermudez b2ec9351e3
Merge pull request #8596 from darwin-traver/patch-29
Typo on logging driver name
2019-04-04 17:12:07 -04:00
Maria Bermudez 3c307d41ed
Merge pull request #8591 from bermudezmt/dtr-hsts
Add HSTS warning for specifying --dtr-external-url
2019-04-04 17:10:46 -04:00
Darwin Traver 8ece7f64eb
Typo on logging driver name 2019-04-04 16:08:43 -04:00
Maria Bermudez 9b77e6af46 Add HSTS warning for specifying --dtr-external-url 2019-04-03 23:41:39 -07:00
Maria Bermudez 0f9378c0d7 Merge branch 'master' of github.com:docker/docker.github.io 2019-04-03 22:45:03 -07:00
Maria Bermudez 3671a094ff
Merge pull request #8573 from yedeyu/patch-1
Fix typo
2019-04-03 22:28:00 -04:00
Maria Bermudez e401b7057b
Merge pull request #8578 from yoyoyoju/patch-1
typo fix
2019-04-03 21:48:29 -04:00
Ally Smith ed490eff22
make jenkinsfile serve private and public docs
After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.
2019-04-03 16:24:33 -05:00
Ally Smith 64cbf59a3e
make jenkinsfile serve private and public docs
After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.
2019-04-03 16:01:55 -05:00
Ally Smith d2e9df79bd
make jenkinsfile serve private and public docs
After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.
2019-04-03 14:17:50 -05:00
Maria Bermudez 6ee2e06e73
Merge pull request #8588 from docker/ucp-relnote-update
Update UCP release notes
2019-04-03 12:58:08 -04:00
Maria Bermudez e88746c6a8
Update release-notes.md 2019-04-03 09:56:56 -07:00
paigehargrave 8dc337686d
Update UCP release notes 2019-04-03 12:52:28 -04:00
paigehargrave 3a4d4f4cbb
Update to UCP known issues 2019-04-03 12:47:29 -04:00
Carl Dunkelberger 55f26aaeb3
--unmanaged-cni is not a valid option for upgrade 2019-04-03 12:42:29 -04:00
Maria Bermudez bf746b4529 Storage backend data migration updates
Fix incorrect API command, add backup updates

Update incorrect commands
2019-04-02 18:07:11 -07:00
Yoju LEE 1662ab4867
typo fix
friendlyname -> friendlyhello
2019-04-02 20:42:20 +02:00
Alastair Smith 900feffb4c fix git url protection in jenkinsfile 2019-04-02 12:24:02 -05:00
Alastair Smith b39d2ddd14 add protection to Jenkinsfile 2019-04-02 12:00:23 -05:00
Alastair Smith a6ecbfddda Merge branch 'master' of https://github.com/docker/docker.github.io 2019-04-02 11:58:48 -05:00
ollypom 601df71246
Updated the 3.1.4 release notes to include Centos 7.6 support 2019-04-02 17:15:18 +01:00
Maria Bermudez 3cf34e8b60
Merge pull request #7626 from hacktivista/patch-1
Update configs.md
2019-04-02 12:11:21 -04:00
Maria Bermudez 41dfff114b
Final edit 2019-04-02 09:09:51 -07:00
Darwin Traver 50f8ea11bd Adding Azure note (#8566)
* Adding Azure note

* Rephrase additional line and update link
2019-04-02 07:26:02 -07:00
hacktivista 7e7297cc9d
Update configs.md 2019-04-02 09:08:02 -03:00
David Ye a2e2846b6c
Fix typo 2019-04-01 23:56:55 -07:00
Maria Bermudez 29a1582bf2
Merge pull request #8569 from docker/master
Sync published with master
2019-04-01 20:56:22 -04:00
Darwin Traver d749399706 Adding Azure note (#8566)
* Adding Azure note

* Rephrase additional line and update link
2019-04-01 20:55:36 -04:00
Vimig Socrates 24e8109ef1
Include Ubuntu version in Dockerfile
more recent versions of Ubuntu don't work with the given Dockerfile
2019-04-01 18:00:36 -04:00
Maria Bermudez 06d00cc3bd
Remove merge conflict 2019-04-01 12:02:31 -07:00
Maria Bermudez c3b0c02153
Audit branch (#8564)
* Update trust-with-remote-ucp.md

* Fix link texts

* Addresses 8446

* Update trust_delegation.md

* - Addresses 8446
- Cleans up broken links
- Fixes vague link texts

Addresses 8446

Update trust_delegation.md

* Update running_ssh_service.md

* Update running_ssh_service.md

Fixed formatting and wording. Also moved note above the code.

* Update running_ssh_service.md

Fixed typo.

* Compose: Update build docs, Add --quiet flag

* Fix destroy reference page link

Relates to https://github.com/docker/docker.github.io/pull/8441

* Rephrase Ubuntu 14.04 note

* Revert "Compose: Update build docs, Add --quiet flag"

* # This is a combination of 4 commits.
# This is the 1st commit message:

- Addresses 8446
- Cleans up broken links
- Fixes vague link texts

Addresses 8446

Update trust_delegation.md

# This is the commit message #2:

# This is a combination of 2 commits.
# This is the 1st commit message:

- Addresses 8446
- Cleans up broken links
- Fixes vague link texts

Addresses 8446

Update trust_delegation.md

# This is the commit message #2:

Update trust-with-remote-ucp.md
# This is the commit message #3:

- Addresses 8446
- Cleans up broken links
- Fixes vague link texts

# This is the commit message #4:

Fix destroy reference page link

Relates to https://github.com/docker/docker.github.io/pull/8441

* - Addresses 8446
- Cleans up broken links
- Fixes vague link texts

* Addresses 8446 with text and link cleanup.

* Update syntax language from none to bash

* Update index.md
2019-04-01 14:45:04 -04:00
Ulysses Souza 9ff6e4f4f6 Add pip dependencies to compose doc for alpine (#8554)
* Add pip dependencies to compose doc for alpine

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>

* Minor edit
2019-04-01 14:35:23 -04:00
Maria Bermudez c98e62f0ec
Merge pull request #8565 from docker/labels-ref-link
Fix labels-reference link
2019-04-01 14:29:08 -04:00
paigehargrave 74b8c48305
Fix labels-reference link 2019-04-01 14:20:17 -04:00
Ally Smith f4a3e5576e
add slack webhook to Jenkinsfile 2019-04-01 13:16:03 -05:00
paigehargrave 67938199a8
Update release-notes.md 2019-04-01 14:14:18 -04:00
Alastair Smith 2ddd114fd3 add slack webhook to Jenkinsfile 2019-04-01 13:14:15 -05:00
Alastair Smith 22cb3ed839 Merge branch 'master' of https://github.com/docker/docker.github.io 2019-04-01 13:11:48 -05:00