diff --git a/Makefile b/Makefile index 98cff5d..29b9d45 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa update-develop +.PHONY: all help build virtualenv requirements-local loaddata run migrate shell collectstatic clean worker qa update-develop upgrade-develop # target: all - Default target. Does nothing. all: @@ -74,7 +74,12 @@ worker: qa: pytest -# target: update-develop - Run push change in repo develop branch and deploy for develop server +# target: update-develop - Run push change in repo develop branch and deploy for develop server with restart only web container update-develop: git push origin develop fab update + +# target: upgrade-develop - Run push change in repo develop branch and deploy for develop server with rebuild container +upgrade-develop: + git push origin develop + fab upgrade diff --git a/fabfile.py b/fabfile.py index 6cac381..2e761e4 100644 --- a/fabfile.py +++ b/fabfile.py @@ -17,14 +17,32 @@ def pull(): @task -def docker_update(): +def docker_rebuild(): with cd(PROJECT_DIR): run('docker-compose build') run('docker-compose down') run('docker-compose up -d') +@task +def docker_restart(): + with cd(PROJECT_DIR): + run('docker-compose restart web') + + +@task +def docker_bash(): + with cd(PROJECT_DIR): + sudo('docker-compose exec web bash') + + +@task +def upgrade(): + pull() + docker_rebuild() + + @task def update(): pull() - docker_update() + docker_restart() diff --git a/src/customer/admin.py b/src/customer/admin.py index 86d9c60..b513fc5 100644 --- a/src/customer/admin.py +++ b/src/customer/admin.py @@ -47,10 +47,10 @@ class LicenseAdmin(admin.ModelAdmin): license_owner.short_description = 'Компания' def balance_days(self, obj): - try: + if obj.date_to: delta = obj.date_to - timezone.now().date() return delta.days - except AttributeError: + else: return '-' balance_days.short_description = 'Остаток дней'