CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9 from Zauberstuhl/master 

Fix gpg missing tty device and typos
This commit is contained in:
Diego Lendoiro 2017-05-23 13:24:01 +01:00 committed by GitHub
parent cd34e738c2 4fbc1fa9d1
commit f4b8fc29d7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -56,9 +56,9 @@ Passbolt docker image provides several environment variables to configure differ
### Core file variables ### Core file variables
* default_salt * salt
* default_seed * cipherseed
* default_url: url of the passbolt installation * url: url of the passbolt installation
### Database variables ### Database variables

6
bin/docker-entrypoint.sh
View File

@ -29,8 +29,8 @@ EOF" -ls /bin/bash nginx
} }
gpg_import_key() { gpg_import_key() {
su -m -c "$gpg --import $gpg_private_key" -ls /bin/bash nginx su -m -c "$gpg --batch --import $gpg_private_key" -ls /bin/bash nginx
su -m -c "$gpg --import $gpg_public_key" -ls /bin/bash nginx su -m -c "$gpg --batch --import $gpg_public_key" -ls /bin/bash nginx
} }
core_setup() { core_setup() {
@ -100,7 +100,7 @@ gen_ssl_cert() {
install() { install() {
local database=${db_host:-$(grep -m1 -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' $db_config)} local database=${db_host:-$(grep -m1 -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' $db_config)}
echo $database echo $database
tables=$(mysql -u passbolt -h $database -p -BN -e "SHOW TABLES FROM passbolt" -p${db_pass:-P4ssb0lt} |wc -l) tables=$(mysql -u $db_user -h $database -p -BN -e "SHOW TABLES FROM passbolt" -p${db_pass:-P4ssb0lt} |wc -l)
if [ $tables -eq 0 ]; then if [ $tables -eq 0 ]; then
su -c "/var/www/passbolt/app/Console/cake install --send-anonymous-statistics true --no-admin" -ls /bin/bash nginx su -c "/var/www/passbolt/app/Console/cake install --send-anonymous-statistics true --no-admin" -ls /bin/bash nginx