Commit Graph

50606 Commits

Author SHA1 Message Date
paigehargrave 20f3c6b145
Merge pull request #7344 from stefjoosten/patch-1
Update index.md
2019-01-07 12:55:10 -05:00
Maria Bermudez 27b909795e
Merge pull request #7492 from artywhite/fix-navsidebar-hover-cursor-pointer
Nav sidebar links hover cursor fix
2019-01-04 16:08:02 -08:00
L-Hudson 5d71a74f9d
Merge pull request #7238 from trapier/fix-interlock-version-on-service-clusters
begin to ucp-ify interlock service clusters
2019-01-04 12:28:24 -05:00
Maria Bermudez 5ad890aa2c
Merge pull request #7049 from trapier/hrm-sni-forwards-instantly
hrm: callout sni forwards immediately
2019-01-04 09:16:28 -08:00
Maria Bermudez e37b2aefea
Minor edit 2019-01-04 09:15:42 -08:00
Maria Bermudez 7e40582b2a
Minor edit 2019-01-04 09:15:01 -08:00
Maria Bermudez 0926f06aee
Merge pull request #7970 from docker/dtr-cli
Follow-up to PR #6964
2019-01-03 17:43:37 -08:00
Maria Bermudez 5fbd73c10a
Follow-up to PR #6964 2019-01-03 17:42:52 -08:00
Maria Bermudez f7ef525200
Merge pull request #7969 from docker/dtr-cli
Add example usage from PR 6964
2019-01-03 17:40:50 -08:00
Maria Bermudez 9eaf4ce9d1
Add example usage from PR 6964 2019-01-03 17:39:48 -08:00
paigehargrave 5dc64ed8d0
Merge pull request #6392 from docbenton/patch-1
SLAT cpu feature should be listed a pre-requisite for Hyper-V
2019-01-03 16:51:41 -05:00
paigehargrave af4aa3cd03
Merge branch 'master' into patch-1 2019-01-03 16:49:59 -05:00
paigehargrave dc258127c0
Incorporated edits from technical review 2019-01-03 16:35:38 -05:00
Maria Bermudez 6942b7d81a
Merge pull request #7165 from ollypom/dtrcachekubernetes
Instructions to deploy a DTR Cache with Kubernetes
2019-01-03 11:39:40 -08:00
Maria Bermudez be0a80d262
Final fixes after local preview of page 2019-01-03 11:33:24 -08:00
Anne Henmi 0b08a05d4c
Merge pull request #7870 from docker/alt-ee-patching-895
Explained patching with CE-EE node activate.
2019-01-03 11:51:08 -07:00
Maria Bermudez 43e94229a9
Fix front matter formatting issue. 2019-01-03 10:26:35 -08:00
Maria Bermudez 81055b419a
Remove ambiguity on registry configuration link 2019-01-03 10:22:43 -08:00
paigehargrave bb426a4408
Merge pull request #6397 from Maks3w/patch-1
Extension fields are only supported from 3.4
2019-01-03 13:14:46 -05:00
L-Hudson cedd9f57ac
Update simple-kube.md
editorial crx
2019-01-03 09:56:32 -05:00
L-Hudson ae485c3f65
Merge pull request #7600 from tgogos/master
update networking.md
2019-01-03 09:48:30 -05:00
L-Hudson 13154cf256
Merge pull request #6900 from justinbarrick/patch-1
Remove references to Qemu requirements in multiarch documentation
2019-01-03 09:46:45 -05:00
L-Hudson 334ba6674f
Update ce-ee-node-activate.md
editorial crx
2019-01-03 09:27:36 -05:00
L-Hudson 20a099200d
Merge pull request #6761 from bruceadowns/patch-2
Update index.md
2019-01-03 08:41:19 -05:00
Maria Bermudez 83fc215c81
Update rails.md 2019-01-02 18:38:28 -08:00
Maria Bermudez ac03878a0f
Merge pull request #7965 from docker/compose-rails
Update rails.md - incorporate feedback from 6254
2019-01-02 18:03:05 -08:00
Maria Bermudez 44c4327630
Merge branch 'master' into compose-rails 2019-01-02 18:02:44 -08:00
Maria Bermudez 1db4eec8d8
Merge pull request #7966 from bermudezmt/leymannx-patch-2
Resolve merge conflicts in PR 6254
2019-01-02 17:59:07 -08:00
Maria Bermudez 7d2f8cfc89 Fix merge conflicts and incorporate content feedback 2019-01-02 17:57:47 -08:00
L-Hudson f9bbe4fc3f
Merge pull request #6989 from dintort/patch-1
Updated gelf.md invalid dash
2019-01-02 19:40:31 -05:00
paigehargrave 2176ab0c9c
Merge pull request #6472 from estrellajm/patch-1
updating bash_profile
2019-01-02 19:08:27 -05:00
Paige Hargrave b5880af23c Merge branch 'leymannx-patch-2' 2019-01-02 17:45:45 -05:00
Norman Kämper-Leymann 9c4ebb876c Update rails.md
Remove `restart: always` again.
2019-01-02 17:44:07 -05:00
Norman Kämper-Leymann 3238740467 Update rails.md
It occupied me quite a while figuring out why this sample didn't have a restart policy. And why we where supposed to always properly stop the containers wheres you normally would simply hit `Ctrl+C`.

Turned out that this `pid` issue is a rails-specific issue. https://github.com/docker/compose/issues/1393#issuecomment-99988242

And of course there's already [a Gem for fixing that](https://github.com/lorenzosinisi/shutup) but having the one-liner in the `docker-compose.yml` keeps the logic where it belongs to (and now also is treated here in the sample).
2019-01-02 17:44:07 -05:00
paigehargrave 6e8f675f25
Update rails.md 2019-01-02 17:27:34 -05:00
Maria Bermudez e6edbdd945
Merge pull request #7178 from adamancini/patch-8
Merging based on previous conversation
2019-01-02 13:42:00 -08:00
Maria Bermudez 77592fc725
Merge pull request #7964 from docker/ucp-emergency-repair
Relates to PR 7667
2019-01-02 13:39:13 -08:00
Maria Bermudez fd5aff6aa3
Readd extra line 2019-01-02 13:37:56 -08:00
Maria Bermudez a53faa18d5
Remove emergency repair flag in the example 2019-01-02 13:18:16 -08:00
Maria Bermudez 262a58bdca
Merge pull request #7667 from bkdocker/patch-1
removed --emergency-repair flag
2019-01-02 13:01:43 -08:00
Maria Bermudez 6984774627
Add note on --emergency-repair usage 2019-01-02 12:57:24 -08:00
Maria Bermudez 73f003886b
Relates to PR 7667 2019-01-02 12:53:55 -08:00
Maria Bermudez f36c2bad4f
Merge pull request #7710 from alejandrox1/master
Update docker sdk go example
2019-01-02 12:43:04 -08:00
Maria Bermudez 96b4ad8fe2
Merge pull request #7950 from spartha80/patch-1
Docker Machine - Installation steps broken
2019-01-02 12:41:02 -08:00
Maria Bermudez 95bead3a02
Incorporate feedback and minor fixes 2019-01-02 12:30:30 -08:00
Maria Bermudez d153ba5527
Merge pull request #7959 from Mario-Hofstaetter/master
Bump docker-compose version in docs to 1.23.2
2019-01-02 12:14:20 -08:00
L-Hudson b54880c7c8
Merge pull request #7663 from henrebotha/patch-2
Remove link to non-existent style guide
2019-01-02 14:30:24 -05:00
L-Hudson 56f392dbc0
Merge pull request #7961 from AndersFluur/patch-1
Adding installation instructions for ubuntu/arm64
2019-01-02 14:27:41 -05:00
Maria Bermudez 4fe7c4c19e
Merge pull request #7956 from nnmer/patch-1
update swarm-config.md, fix typo
2019-01-02 11:26:48 -08:00
Maria Bermudez e31955bd7b
Minor edit 2019-01-02 11:26:18 -08:00