mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-12-04 15:26:48 +00:00
Fixes merge block
This commit is contained in:
parent
036463c8d9
commit
c0fc0431e7
1 changed files with 0 additions and 17 deletions
17
bw-dev
17
bw-dev
|
@ -49,23 +49,6 @@ case "$CMD" in
|
|||
initdb)
|
||||
initdb
|
||||
;;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
resetdb)
|
||||
clean
|
||||
# Start just the DB so no one else is using it
|
||||
docker-compose up --build -d db
|
||||
execdb dropdb -U ${POSTGRES_USER} ${POSTGRES_DB}
|
||||
execdb createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
|
||||
# Now start up web so we can run the migrations
|
||||
docker-compose up --build -d web
|
||||
initdb
|
||||
clean
|
||||
;;
|
||||
makemigrations)
|
||||
runweb python manage.py makemigrations "$@"
|
||||
;;
|
||||
>>>>>>> main
|
||||
migrate)
|
||||
runweb python manage.py migrate "$@"
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue