isitdeployable

Merge lp:~cjwatson/isitdeployable/fix-app-update-db into lp:isitdeployable

  1. fix-app-update-db
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 275
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~cjwatson/isitdeployable/fix-app-update-db
Merge into: lp:isitdeployable
Diff against target: 19 lines (+4/-4)
1 file modified
Makefile.docker (+4/-4)
To merge this branch: bzr merge lp:~cjwatson/isitdeployable/fix-app-update-db
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+336916@code.launchpad.net

Commit message

Detect errors properly in "make app-update-db".

Description of the change

"foo; bar" in shell ignores errors from foo. I considered "foo && bar" instead, but in this case it makes more sense to just use the usual make idiom.

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.docker'
2--- Makefile.docker 2017-10-03 15:08:45 +0000
3+++ Makefile.docker 2018-01-31 13:07:41 +0000
4@@ -61,11 +61,11 @@
5 ### targets for in-container use
6
7 app-update-db: DB_USER=$(shell echo $(DATABASE_URL) | cut -d ':' -f 2 | cut -d '@' -f 1 | sed -e 's|//||')
8+app-update-db: export DATABASE_URL=$(ADMIN_DATABASE_URL)
9 app-update-db:
10- @export DATABASE_URL=$(ADMIN_DATABASE_URL); \
11- $(MAKE) manage ARGS='syncdb --noinput' PYTHON=python; \
12- $(MAKE) manage ARGS='migrate --noinput' PYTHON=python; \
13- $(MAKE) manage ARGS='grantuser $(DB_USER)' PYTHON=python
14+ $(MAKE) manage ARGS='syncdb --noinput' PYTHON=python
15+ $(MAKE) manage ARGS='migrate --noinput' PYTHON=python
16+ $(MAKE) manage ARGS='grantuser $(DB_USER)' PYTHON=python
17
18 app-start: BIND = 0.0.0.0:8000
19 app-start: WORKERS ?= 3

Subscribers

People subscribed via source and target branches