Skip to content

Commit 6d6f043

Browse files
committed
s/Vagrant/Docker/
1 parent 6af80aa commit 6d6f043

File tree

6 files changed

+36
-121
lines changed

6 files changed

+36
-121
lines changed

Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM python:2
2+
ENV PYTHONUNBUFFERED 1
3+
RUN mkdir /code
4+
WORKDIR /code
5+
COPY requirements /code/requirements
6+
RUN pip install -r /code/requirements/dev.txt
7+
ADD . /code/

Vagrantfile

Lines changed: 0 additions & 94 deletions
This file was deleted.

docker-compose.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: '3'
2+
3+
volumes:
4+
pgdata:
5+
6+
services:
7+
db:
8+
image: postgres
9+
restart: always
10+
ports:
11+
- "5432:5432"
12+
volumes:
13+
- pgdata:/var/lib/postgresql/data/
14+
web:
15+
build: .
16+
command: python manage.py runserver 0.0.0.0:8000
17+
environment:
18+
- DB_NAME=postgres
19+
- DB_USER=postgres
20+
- DB_HOST=db
21+
volumes:
22+
- .:/code
23+
ports:
24+
- "8000:8000"
25+
depends_on:
26+
- db

fixtures/conference.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"model": "conference.conference",
55
"fields": {
66
"timezone": "US/Pacific",
7-
"start_date": "2017-05-17",
8-
"end_date": "2017-05-25",
9-
"title": "PyCon 2017"
7+
"start_date": "2018-05-9",
8+
"end_date": "2018-05-17",
9+
"title": "PyCon 2018"
1010
}
1111
}
1212
]

fixtures/initial_boxes.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

fixtures/sitetree_menu.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -475,29 +475,6 @@
475475
"model": "sitetree.treeitem",
476476
"pk": 20
477477
},
478-
{
479-
"fields": {
480-
"access_loggedin": false,
481-
"access_perm_type": 1,
482-
"access_permissions": [],
483-
"access_restricted": false,
484-
"alias": null,
485-
"description": "",
486-
"hidden": false,
487-
"hint": "",
488-
"inbreadcrumbs": true,
489-
"inmenu": true,
490-
"insitetree": true,
491-
"parent": null,
492-
"sort_order": 30,
493-
"title": "News",
494-
"tree": 1,
495-
"url": "http://pycon.blogspot.com/",
496-
"urlaspattern": false
497-
},
498-
"model": "sitetree.treeitem",
499-
"pk": 21
500-
},
501478
{
502479
"fields": {
503480
"access_loggedin": false,

0 commit comments

Comments
 (0)