← Back to branch summary

~maxiberta/isitdeployable/update-project-url

« back to all changes in this revision

Viewing changes to Makefile.docker

  • Committer: Ubuntu One Auto Copilot
  • Author(s): Colin Watson
  • Date: 2018-01-31 13:43:22 UTC
  • mfrom: (274.1.1 fix-app-update-db)
  • Revision ID: otto-copilot@canonical.com-20180131134322-6yyiybhfx7pcwp1w
Detect errors properly in "make app-update-db".

Merged from https://code.launchpad.net/~cjwatson/isitdeployable/fix-app-update-db/+merge/336916

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.docker
61
61
### targets for in-container use
62
62
 
63
63
app-update-db: DB_USER=$(shell echo $(DATABASE_URL) | cut -d ':' -f 2 | cut -d '@' -f 1 | sed -e 's|//||')
 
64
app-update-db: export DATABASE_URL=$(ADMIN_DATABASE_URL)
64
65
app-update-db:
65
 
        @export DATABASE_URL=$(ADMIN_DATABASE_URL); \
66
 
                $(MAKE) manage ARGS='syncdb --noinput' PYTHON=python; \
67
 
                $(MAKE) manage ARGS='migrate --noinput' PYTHON=python; \
68
 
                $(MAKE) manage ARGS='grantuser $(DB_USER)' PYTHON=python
 
66
        $(MAKE) manage ARGS='syncdb --noinput' PYTHON=python
 
67
        $(MAKE) manage ARGS='migrate --noinput' PYTHON=python
 
68
        $(MAKE) manage ARGS='grantuser $(DB_USER)' PYTHON=python
69
69
 
70
70
app-start: BIND = 0.0.0.0:8000
71
71
app-start: WORKERS ?= 3