Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ COPY --chown=www-data:www-data docker/database.docker.sqlite3.yml config/databas
RUN mkdir -p /var/www

# Fix permissions
RUN chown www-data:www-data config/initializers public sqlite3-db /var/www
RUN chown -R www-data:www-data config public/api
RUN chown -R www-data:www-data /var/www config docker db/schema.rb public solr sqlite3-db
RUN chmod -R 755 docker/upgrade.sh docker/start_workers.sh

# Python dependencies from requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion docker/shared_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function wait_for_mysql {
}

function wait_for_database {
while ! mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h $MYSQL_HOST -e "desc $MYSQL_DATABASE.users" > /dev/null
while ! mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -h $MYSQL_HOST -e "desc $MYSQL_DATABASE.users" > /dev/null 2>&1
do
echo "WAITING FOR DATABASE"
sleep 2
Expand Down