From 69887d2da031bd96b8c93aff3cd2bd18d13657e8 Mon Sep 17 00:00:00 2001 From: Jordan Arentsen Date: Tue, 24 Sep 2013 02:12:24 -0500 Subject: [PATCH 1/3] 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 --- .../docs/sources/examples/postgresql_service.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/engine/docs/sources/examples/postgresql_service.rst b/components/engine/docs/sources/examples/postgresql_service.rst index 27543ec5a3..c0b5404d1a 100644 --- a/components/engine/docs/sources/examples/postgresql_service.rst +++ b/components/engine/docs/sources/examples/postgresql_service.rst @@ -66,14 +66,14 @@ other roles. Following Vagrant's convention the role will be named .. code-block:: bash - sudo -u postgres createuser -P -d -r -s docker + sudo postgres -c "createuser -P -d -r -s docker" Create a test database also named ``docker`` owned by previously created ``docker`` role. .. code-block:: bash - sudo -u postgres createdb -O docker docker + sudo postgres -c "createdb -O docker docker" Adjust PostgreSQL configuration so that remote connections to the database are possible. Make sure that inside @@ -99,7 +99,7 @@ Bash prompt; you can also locate it using ``docker ps -a``. .. code-block:: bash - docker commit /postgresql + docker commit postgresql Finally, run PostgreSQL server via ``docker``. @@ -149,10 +149,10 @@ container starts. .. code-block:: bash - sudo docker commit /postgresql -run='{"Cmd": \ + sudo docker commit postgresql -run='{"Cmd": \ ["/bin/su", "postgres", "-c", "/usr/lib/postgresql/9.2/bin/postgres -D \ /var/lib/postgresql/9.2/main -c \ - config_file=/etc/postgresql/9.2/main/postgresql.conf"], PortSpecs": ["5432"]} + config_file=/etc/postgresql/9.2/main/postgresql.conf"], "PortSpecs": ["5432"]}' From now on, just type ``docker run /postgresql`` and PostgreSQL should automatically start. From 6fd51a9a7dee83f436b06223a17cf6d7c2a7c761 Mon Sep 17 00:00:00 2001 From: blissdev Date: Tue, 24 Sep 2013 02:25:16 -0500 Subject: [PATCH 2/3] use su instead of sudo Upstream-commit: 17b7194d91ba91e044155edf7ae0a485c2dd9c0b Component: engine --- .../engine/docs/sources/examples/postgresql_service.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/docs/sources/examples/postgresql_service.rst b/components/engine/docs/sources/examples/postgresql_service.rst index c0b5404d1a..9e5bda5076 100644 --- a/components/engine/docs/sources/examples/postgresql_service.rst +++ b/components/engine/docs/sources/examples/postgresql_service.rst @@ -66,14 +66,14 @@ other roles. Following Vagrant's convention the role will be named .. code-block:: bash - sudo postgres -c "createuser -P -d -r -s docker" + su postgres -c "createuser -P -d -r -s docker" Create a test database also named ``docker`` owned by previously created ``docker`` role. .. code-block:: bash - sudo postgres -c "createdb -O docker docker" + su postgres -c "createdb -O docker docker" Adjust PostgreSQL configuration so that remote connections to the database are possible. Make sure that inside From fb1ac0f2c23d3426ee82e3d9616c992256bb78d6 Mon Sep 17 00:00:00 2001 From: blissdev Date: Tue, 24 Sep 2013 15:51:21 -0500 Subject: [PATCH 3/3] revert removal of slash betwixt user/repo Upstream-commit: c000e6a7fce11aaddae916853cc551d4801c1f8e Component: engine --- components/engine/docs/sources/examples/postgresql_service.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/docs/sources/examples/postgresql_service.rst b/components/engine/docs/sources/examples/postgresql_service.rst index 9e5bda5076..2df02b40c5 100644 --- a/components/engine/docs/sources/examples/postgresql_service.rst +++ b/components/engine/docs/sources/examples/postgresql_service.rst @@ -99,7 +99,7 @@ Bash prompt; you can also locate it using ``docker ps -a``. .. code-block:: bash - docker commit postgresql + docker commit /postgresql Finally, run PostgreSQL server via ``docker``.