Skip to content

Commit 588799f

Browse files
authored
Merge pull request #236 from nottrobin/update-django
Update to latest django v1
2 parents 2eafa1c + 6e8ad1e commit 588799f

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ defaults: &defaults
55
- image: canonicalwebteam/dev:v1.6.4
66
- image: postgres
77
name: db
8+
environment:
9+
POSTGRES_HOST_AUTH_METHOD: "trust"
810

911
jobs:
1012
test-site:

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
canonicalwebteam.versioned-static==1.0.2
22
talisker[gunicorn]==0.15.0
3-
Django==1.11.27
3+
Django==1.11.29
44
django-preserialize==1.2.1
55
psycopg2==2.8.4
66
dj-database-url==0.5.0

run

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ start_django_db () {
183183
--network ${network_name} `# Use an isolated network` \
184184
--network-alias db `# Call this container "db" on the network so it can be found` \
185185
--detach `# Run in the background` \
186+
--env POSTGRES_HOST_AUTH_METHOD="trust" `# Allow without a password` \
186187
postgres `# Use the image for node version 7`
187188
fi
188189

0 commit comments

Comments
 (0)