docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,572 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

50572 Commits

Author SHA1 Message Date
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 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
Maria Bermudez 52e3cc35c6
Merge pull request #7953 from billgrant/patch-1 
unknown flag: --join
 2019-01-02 10:57:33 -08:00
Maria Bermudez e6ec3d41c9
Merge pull request #7875 from londoncalling/PR-3903-docker-restart-options 
Related pages links for docs per suggestion in PR#3903
 2019-01-02 10:56:27 -08:00
Maria Bermudez 1a5c6b7287
Merge pull request #7679 from waclawjacek/patch-1 
Mark "docker-compose down" as code, not a link
 2019-01-02 10:39:33 -08:00
Anne Henmi be71a9a8b7
Merge pull request #7455 from waldyrious/patch-2 
get-started/part2: clarify usage of -t/--tag
 2019-01-02 08:48:28 -07:00
Anne Henmi 9ae4095bf8
Merge branch 'master' into patch-2 2019-01-02 08:47:44 -07:00
AndersFluur fb64be7b87
Adding arm64 (aarch64 architecture) 2019-01-02 14:35:27 +01:00
Anne Henmi 77e1c3d700
Update part2.md 
Wording cleanup.
 2019-01-01 17:58:27 -07:00
Mario-Hofstaetter 85ca4054fc
Update install.md 
Update build hash for version 1.23.2
 2019-01-01 22:27:24 +01:00
Mario-Hofstaetter 761b2d5aea
Update _config.yml 
Bump compose_version to "1.23.2"
 2019-01-01 22:24:46 +01:00
Anton Romanov 92f6c3b169
update swarm-config.md, fix typo 
update swarm-config.md, fix typo
 2019-01-01 12:23:22 +08:00
Bill Grant b759eb9c60
unknown flag: --join 
Running: 
```
$ docker swarm --join --token <TOKEN> \
  --advertise-addr <IP-ADDRESS-OF-WORKER-1> \
  <IP-ADDRESS-OF-MANAGER>:2377
```
throws the following error

```
unknown flag: --join
See 'docker swarm --help'.

Usage:	docker swarm COMMAND

Manage Swarm

Commands:
  ca          Display and rotate the root CA
  init        Initialize a swarm
  join        Join a swarm as a node and/or manager
  join-token  Manage join tokens
  leave       Leave the swarm
  unlock      Unlock swarm
  unlock-key  Manage the unlock key
  update      Update the swarm

Run 'docker swarm COMMAND --help' for more information on a command.
```

The command in the PR returns

```
This node joined a swarm as a worker.
```
 2018-12-31 10:46:26 -05:00
spartha80 13f23ef6b6
Docker Machine - Installation steps broken 
https://github.com/docker/machine/downloads/ is no longer available. The path mentioned in the documentation is to be replaced with https://github.com/docker/machine/releases/tags
 2018-12-31 12:26:40 +05:30
Maria Bermudez f7c7b58a78
Merge pull request #7943 from docker/fix-link-7937 
Fix broken link
 2018-12-28 16:23:50 -08:00
Maria Bermudez 8a04e93d0d
Fix broken link 2018-12-28 16:22:56 -08:00
Maria Bermudez d24ae4e055
Merge pull request #7904 from adamancini/patch-12 
Update release-notes.md
 2018-12-28 16:09:42 -08:00
Maria Bermudez 3140630869
Minor edits 2018-12-28 16:09:13 -08:00
paigehargrave 2788a53481
Merge pull request #7728 from siyu6974/patch-1 
Update example for deprecated name
 2018-12-28 13:09:11 -05:00
Maria Bermudez 7b0d922200
Merge pull request #7493 from artywhite/readme-important-css-file-fix 
Readme.md file css file path fix
 2018-12-28 09:28:22 -08:00
Anne Henmi e395b9de4b
Merge pull request #7187 from trapier/notary-set-selinux-context 
notary: set selinux context while installing
 2018-12-28 10:18:47 -07:00
Anne Henmi aa92a9edc2
Merge pull request #6861 from nvcastet/patch-1 
Update seccomp.md
 2018-12-28 10:15:32 -07:00
Maria Bermudez da0c9b2dfd
Merge pull request #6851 from lenestopage/patch-8 
Update install.md
 2018-12-28 09:07:10 -08:00
Anne Henmi d235ceeb49
Merge pull request #7717 from sudo-bmitch/pr-uninst-old 
Adding containerd and runc to cleanup on old Debian/Ubuntu installs
 2018-12-28 10:05:04 -07:00