clean up makefile so the default command is 'make start'

This commit is contained in:
Jonathan Math 2020-10-09 12:28:10 +07:00
parent 5b5345d35f
commit 039c7b20e9

View file

@ -2,6 +2,11 @@ newsblur := $(shell docker ps -qf "name=newsblur_web")
CURRENT_UID := $(shell id -u)
CURRENT_GID := $(shell id -g)
#creates newsblur, but does not rebuild images or create keys
start:
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose down
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d
#creates newsblur, builds new images, and creates/refreshes SSL keys
nb:
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose down
@ -11,11 +16,6 @@ nb:
- docker-compose exec newsblur_web ./manage.py migrate
- docker-compose exec newsblur_web ./manage.py loaddata config/fixtures/bootstrap.json
#creates newsblur, but does not rebuild images or create keys
nb-no-build:
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose down
- CURRENT_UID=${CURRENT_UID} CURRENT_GID=${CURRENT_GID} docker-compose up -d
# allows user to exec into newsblur_web and use pdb.
nb-exec:
# run `make nb-no-build` if this doesn't work
@ -27,7 +27,7 @@ nb-down:
# runs tests
test:
- ./manage.py test --settings=utils.test_settings
- docker-compose exec newsblur_web ./manage.py test --settings=utils.test_settings
keys:
- rm config/certificates