public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add RUNWITHMAKEBUILD=True to makefile docker-compose commands. add make command for looking at mongo logs

Browse source
This commit is contained in:
Jonathan Math 2021-06-29 08:33:30 -06:00
parent 8e21996bbd
commit bbfb66cdd4
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Makefile
View file

@ -12,11 +12,11 @@ metrics:
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose -f docker-compose.yml -f docker-compose.metrics.yml up -d
metrics-ps:
- docker-compose -f docker-compose.yml -f docker-compose.metrics.yml ps
- RUNWITHMAKEBUILD=True docker-compose -f docker-compose.yml -f docker-compose.metrics.yml ps
rebuild:
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose down
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose down
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d
#creates newsblur, builds new images, and creates/refreshes SSL keys
nb: pull
@ -24,24 +24,27 @@ nb: pull
- [[ -d config/certificates ]] && echo "keys exist" || make keys
- cd node && npm install & cd ..
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d --build --remove-orphans
- docker-compose exec newsblur_web ./manage.py migrate
- docker-compose exec newsblur_web ./manage.py loaddata config/fixtures/bootstrap.json
- RUNWITHMAKEBUILD=True docker-compose exec newsblur_web ./manage.py migrate
- RUNWITHMAKEBUILD=True docker-compose exec newsblur_web ./manage.py loaddata config/fixtures/bootstrap.json
shell:
- - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web ./manage.py shell_plus
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web ./manage.py shell_plus
bash:
- - CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web bash
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web bash
# allows user to exec into newsblur_web and use pdb.
debug:
- newsblur := $(shell docker ps -qf "name=newsblur_web")
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker attach ${newsblur}
log:
- docker-compose logs -f --tail 20 newsblur_web newsblur_node
- RUNWITHMAKEBUILD=True docker-compose logs -f --tail 20 newsblur_web newsblur_node
logmongo:
- RUNWITHMAKEBUILD=True docker-compose logs -f db_mongo
alllogs:
- docker-compose logs -f --tail 20
- RUNWITHMAKEBUILD=True docker-compose logs -f --tail 20
# brings down containers
down:
- docker-compose -f docker-compose.yml down
- RUNWITHMAKEBUILD=True docker-compose -f docker-compose.yml down
nbdown: down
jekyll:
- cd blog && bundle exec jekyll serve
@ -50,17 +53,8 @@ jekyll_drafts:
# runs tests
test:
- python manage.py test --settings=newsblur_web.test_settings apps/analyzer
- python manage.py test --settings=newsblur_web.test_settings apps/api
- python manage.py test --settings=newsblur_web.test_settings apps/categories
- python manage.py test --settings=newsblur_web.test_settings apps/feed_import
- python manage.py test --settings=newsblur_web.test_settings apps/profile
- python manage.py test --settings=newsblur_web.test_settings apps/push
- python manage.py test --settings=newsblur_web.test_settings apps/reader
- python manage.py test --settings=newsblur_web.test_settings apps/rss_feeds
#- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} TEST=True docker-compose -f docker-compose.yml up -d newsblur_web
#- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} DJANGO_SETTINGS_MODULE=newsblur_web.test_settings docker-compose exec newsblur_web pytest --ignore ./vendor --verbosity 3
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} TEST=True docker-compose -f docker-compose.yml up -d newsblur_web
- RUNWITHMAKEBUILD=True CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose exec newsblur_web bash -c "NOSE_EXCLUDE_DIRS=./vendor DJANGO_SETTINGS_MODULE=newsblur_web.test_settings python3 manage.py test -v 3 --failfast"
keys:
- mkdir config/certificates