From 892592505fa388a4f52cc44dc61e9b8c5beb4ac7 Mon Sep 17 00:00:00 2001 From: Yves Lavoie Date: Fri, 8 Jun 2018 13:21:51 -0400 Subject: [PATCH 1/2] Update README with docker-compose instructions --- README.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e47eb3..0ebfd11 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,12 @@ could require additional setup of a mail service or CUPS printer service. # How to use this image -## Start a postgres instance +This image can be installed either manually by following the steps below or +automatically with the Docker compose file. + +## Manual installation + +### Start a postgres instance ```plain $ docker run -d --name postgres \ @@ -61,7 +66,7 @@ please use these commands instead: postgres:latest ``` -## Start LedgerSMB +### Start LedgerSMB ```plain $ docker run -d -p 5762:5762 --name myledger \ @@ -72,7 +77,21 @@ This command maps port 5762 of your container to port 5762 in your host. The web application inside the container should now be accessible through http://localhost:5762/setup.pl. -## Set up LedgerSMB +## Docker-Compose installation and start + +This image provides `docker-compose.yml` which can be used to pull related +images, install them, establish an internal network for their communications, +adjust environment variables, start and stop LedgerSMB. The only instructions +required, after the optional edition of the file to adjust the environment +variables, are: + +```plain + $ docker-compose build + $ docker-compose up +``` + + +# Set up LedgerSMB * Visit http://myledger:5762/setup.pl. * Log in with the "postgres" user and the password `mysecretpassword` From 13b4e0f933bb16b9a1872afb9c0545a1ed3f8123 Mon Sep 17 00:00:00 2001 From: Yves Lavoie Date: Wed, 13 Jun 2018 12:22:50 -0400 Subject: [PATCH 2/2] Move docker-compose instructions upward and pull images instead of building --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 0ebfd11..7412543 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,22 @@ could require additional setup of a mail service or CUPS printer service. # How to use this image -This image can be installed either manually by following the steps below or -automatically with the Docker compose file. +This image can be installed either automatically with the Docker compose file +manually with docker only. + +## Docker-Compose installation and start + +This image provides `docker-compose.yml` which can be used to pull related +images, install them, establish an internal network for their communications, +adjust environment variables, start and stop LedgerSMB. The only instructions +required, after the optional edition of the file to adjust the environment +variables, are: + +```plain + $ docker-compose pull + $ docker-compose up +``` + ## Manual installation @@ -77,20 +91,6 @@ This command maps port 5762 of your container to port 5762 in your host. The web application inside the container should now be accessible through http://localhost:5762/setup.pl. -## Docker-Compose installation and start - -This image provides `docker-compose.yml` which can be used to pull related -images, install them, establish an internal network for their communications, -adjust environment variables, start and stop LedgerSMB. The only instructions -required, after the optional edition of the file to adjust the environment -variables, are: - -```plain - $ docker-compose build - $ docker-compose up -``` - - # Set up LedgerSMB * Visit http://myledger:5762/setup.pl.