From a0940010691d41639b765034cfb929a63a3463d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Sch=C3=BCller?= Date: Sun, 6 Nov 2016 12:13:28 +0100 Subject: [PATCH] Fixed some typos --- Dockerfile | 2 +- README.md | 9 +++++++-- scripts/bootstrap.sh | 4 ++-- scripts/start_setup.sh | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 08fb879..49fcd9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ENV PORT 2317 ENV SETUP_PORT 2316 # Language of interface and setup -ENV LANGUAGE ${LANGUAGE} +ENV LANGUAGE de EXPOSE ${PORT} EXPOSE ${SETUP_PORT} diff --git a/README.md b/README.md index f732c53..95402f5 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ if you happen to have the git repository you can also execute: ## Setup The setup will be started automatically [http://localhost:2316] if no database can be found - + **Please be patient** the setup tool will be installed "on the fly" only upon the *first start* if you don't have any genealogy database. If you start the container and you already have a database but you want more databases or do some backup you need to start the setup manually like so: @@ -45,5 +45,10 @@ docker rm docker-geneweb ## Backup If you need to do a backup just either backup your data folder (e.g. `${HOME}/GenealogyData`) -To export the data as "*.ged" file or similar you need to start the "setup" tool (see above) +To export the data as "*.ged" file or similar you need to start the "setup" tool + +``` +docker exec docker-geneweb /start_setup.sh +``` +and then navigate to [http://localhost:2316] diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index f7f8789..85db8be 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -3,7 +3,7 @@ # no database found - we need the setup if [ $(ls ${GENEWEBDB}/*.gwb 2>/dev/null|wc -l) -eq 0 ]; then - /start_setup.sh + /start_setup.sh & fi -/usr/bin/gwd -lang ${LANGUAGE} -hd ${GENEWEBSHARE} -dd ${GENEWEBDOC} -bd ${GENEWEBDB} -p ${PORT} +/usr/bin/gwd -lang${LANGUAGE} -hd${GENEWEBSHARE} -dd${GENEWEBDOC} -bd${GENEWEBDB} -p${PORT} diff --git a/scripts/start_setup.sh b/scripts/start_setup.sh index b3a3487..8bc2b66 100755 --- a/scripts/start_setup.sh +++ b/scripts/start_setup.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash pushd ${GENEWEBDB} - gwsetup -p ${SETUP_PORT} -gd ${GENEWEBSHARE} -lang ${LANGUAGE} -only /setup_ips.txt -log ${SETUP_LOGFILE} & + gwsetup -p${SETUP_PORT} -gd${GENEWEBSHARE} -lang${LANGUAGE} -log${SETUP_LOGFILE} -only/setup_ips.txt popd