isitdeployable

Merge lp:~ricardokirkner/isitdeployable/db-schema-migrations-custom-settings into lp:isitdeployable

  1. db-schema-migrations-custom-settings
  2. Merge into trunk
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: 238
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~ricardokirkner/isitdeployable/db-schema-migrations-custom-settings
Merge into: lp:isitdeployable
Diff against target: 24 lines (+4/-3)
1 file modified
Makefile.docker (+4/-3)
To merge this branch: bzr merge lp:~ricardokirkner/isitdeployable/db-schema-migrations-custom-settings
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+329121@code.launchpad.net

Commit message

use custom admin settings module for database migrations

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) :
review: Approve
lp:~ricardokirkner/isitdeployable/db-schema-migrations-custom-settings updated
238. By Ricardo Kirkner

avoid intermediate settings file by exposing the right environment variable

Revision history for this message
Ricardo Kirkner (ricardokirkner) :
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-08-16 13:33:15 +0000
3+++ Makefile.docker 2017-08-16 15:58:11 +0000
4@@ -4,7 +4,7 @@
5 # define docker related variables
6 DOCKER_COMPOSE_FILES ?= -f docker-compose.yml
7 DOCKER_COMPOSE ?= $(ENV)/bin/docker-compose
8-TAG ?= deployable:dev
9+TAG ?= deployable
10
11 # export UID/GID so docker-compose will pick it up from the env
12 UID := $(shell id -u)
13@@ -52,8 +52,9 @@
14 ### targets for in-container use
15
16 app-update-db:
17- DATABASE_URL=$(ADMIN_DATABASE_URL) $(MAKE) manage ARGS='syncdb --noinput' PYTHON=python
18- DATABASE_URL=$(ADMIN_DATABASE_URL) $(MAKE) manage ARGS='migrate --noinput' PYTHON=python
19+ @export DATABASE_URL=$(ADMIN_DATABASE_URL); \
20+ $(MAKE) manage ARGS='syncdb --noinput' PYTHON=python; \
21+ $(MAKE) manage ARGS='migrate --noinput' PYTHON=python
22
23 app-start: BIND=0.0.0.0:8000
24 app-start: WORKERS=3

Subscribers

People subscribed via source and target branches