-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into PHRAS-3869-secure-locale
- Loading branch information
Showing
8 changed files
with
40 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,33 +8,21 @@ php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer | |
|
||
composer install --ignore-platform-reqs --no-interaction | ||
|
||
|
||
|
||
if [ -z "$PHRASEANET_ADMIN_ACCOUNT_EMAIL" ]; then | ||
echo "PHRASEANET_ADMIN_ACCOUNT_EMAIL, Phraseanet admin account var is not set." | ||
exit 1 | ||
fi | ||
|
||
if [ -z "$PHRASEANET_ADMIN_ACCOUNT_PASSWORD " ]; then | ||
echo "$PHRASEANET_ADMIN_ACCOUNT_PASSWORD, Phaseanet admin password var is not set." | ||
exit 1 | ||
fi | ||
|
||
FILE=config/configuration.yml | ||
|
||
while [[ ! -e "$FILE" ]] | ||
do | ||
sleep 10 | ||
/var/alchemy/Phraseanet/bin/setup system:install \ | ||
--email=$PHRASEANET_ADMIN_ACCOUNT_EMAIL \ | ||
--password=$PHRASEANET_ADMIN_ACCOUNT_PASSWORD \ | ||
--db-host=$PHRASEANET_DB_HOST \ | ||
--db-port=$PHRASEANET_DB_PORT \ | ||
--db-user=$PHRASEANET_DB_USER \ | ||
--db-password=$PHRASEANET_DB_PASSWORD \ | ||
--db-template=$INSTALL_DB_TEMPLATE \ | ||
--appbox=$INSTALL_APPBOX \ | ||
--databox=$INSTALL_DATABOX \ | ||
--email=[email protected] \ | ||
--password=test \ | ||
--db-host=db \ | ||
--db-port=3306 \ | ||
--db-user=root \ | ||
--db-password=root \ | ||
--db-template=DublinCore \ | ||
--appbox=ab_master \ | ||
--databox=db_databox1 \ | ||
--server-name=$PHRASEANET_BASE_URL \ | ||
--download-path=$PHRASEANET_DOWNLOAD_DIR \ | ||
--lazaret-path=$PHRASEANET_LAZARET_DIR \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters