1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

17 Commits

Author SHA1 Message Date
Andy Rothfusz
e5d73f33fc Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
Conflicts:
	docs/sources/examples/postgresql_service.rst
Upstream-commit: 0bfa22124e87197be8ce47cee4e998eb9d6891b5
Component: engine
2013-12-04 18:25:58 -08:00
Andy Rothfusz
dce2c8c9b7 Merge pull request #2946 from dhrp/doc-postgres-typo
Fixed some grammar and one other line in postgres example
Upstream-commit: de60bee3d4f34cdc61120463851fb996c4d8eb4c
Component: engine
2013-12-04 10:51:02 -08:00
Dustin Sallings
b0a3ce1eef Use inspect format to get IP address for psql example
Upstream-commit: 1d503be4660667a27b42f7bf0c089404cabd2c9c
Component: engine
2013-12-02 11:07:41 -08:00
James Turnbull
801d5c9c0f Updated and simplified the PG example
Upstream-commit: 39aac21db47b3bcbf651008267ad1142f1213103
Component: engine
2013-11-30 10:58:52 -05:00
Thatcher Peskens
be864815d2 Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
Upstream-commit: 8291d509c234779dff081ab579b6ff30358e7501
Component: engine
2013-11-28 17:19:26 -08:00
Bruno Bigras
ac21fde93d Update postgresql's version in example
It seems ppa:pitti/postgresql will be deprecated and only apt.postgresql.org has 9.3.
Upstream-commit: 45b1e8c2362b3626ccc564496e3093386bb89cd9
Component: engine
2013-11-27 09:55:41 -05:00
James Turnbull
c9ed212566 A variety of syntax and style fixes for the Docker examples
* Made Docker a proper noun when needed.
* Fixed code syntax
* Fixed some whitespace issues
* Fixed some typos and grammar
* Tidied up some examples
Upstream-commit: 1cb4557cc8e40f509898bded6684a45070fbb2a4
Component: engine
2013-11-02 18:26:52 -07:00
Andy Rothfusz
6de23da0ea Merge pull request #2160 from iffy/patch-1
Minor updates to postgresql_service.rst
Upstream-commit: 93b258413f07861cc3b57917fb102313881f4630
Component: engine
2013-10-14 11:59:57 -07:00
Matt Haggard
c24e35d823 Minor updates to postgresql_service.rst
I've added the steps that were missing/wrong for me when I went through this just now.
Upstream-commit: 9041d6a47bef475aa58bb47b38f49ac408fb94bf
Component: engine
2013-10-10 10:23:24 -06:00
Julien Dubois
068d644efe Corrected error in the package name
Upstream-commit: 152037f011de00cbe06069687024bc345c76b0c6
Component: engine
2013-10-10 10:10:33 +02:00
blissdev
fb1ac0f2c2 revert removal of slash betwixt user/repo
Upstream-commit: c000e6a7fce11aaddae916853cc551d4801c1f8e
Component: engine
2013-09-24 15:51:21 -05:00
blissdev
6fd51a9a7d use su instead of sudo
Upstream-commit: 17b7194d91ba91e044155edf7ae0a485c2dd9c0b
Component: engine
2013-09-24 02:25:16 -05:00
Jordan Arentsen
69887d2da0 various command fixes
Indicating the repository and tag should be separated by a space and not a '/'. Also fixed a quote typo.
Upstream-commit: 15ad2915b95bd13067691ed3c7dcab67f529d37f
Component: engine
2013-09-24 02:12:24 -05:00
elmendalerenda
9fa228bf68 fixed postgresql conf setting
small typo, changed listen_address to listen_addresses
Upstream-commit: 83acd37161ed7149843546a779a95fdaf3e2458f
Component: engine
2013-08-19 14:20:25 +01:00
Andy Rothfusz
fd36c14020 Fix #1517, #1521 by adding sudo to examples and installation.
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00
Zaiste!
e65d5282fa fix/docs: ubuntu instead of base, note about root-only
Upstream-commit: 3af60bf37565de35643c95eae9fd4ddc863c21fc
Component: engine
2013-08-12 15:30:52 +02:00
Zaiste!
f87f880dcc docs/postgresql: PostgreSQL service on Docker example
Upstream-commit: d52c1490753cb924aa2aeeefc92fbe7a985f4cd3
Component: engine
2013-08-12 12:03:43 +02:00