Bläddra i källkod

sandbox: Add docker-compose file

This also updates the settings file to use the values from the environ
master
Michael van Tellingen 8 år sedan
förälder
incheckning
1d0de1d21e
Inget konto är kopplat till bidragsgivarens mejladress
3 ändrade filer med 32 tillägg och 6 borttagningar
  1. 6
    0
      .editorconfig
  2. 20
    0
      docker-compose.yml
  3. 6
    6
      sites/sandbox/settings.py

+ 6
- 0
.editorconfig Visa fil

@@ -0,0 +1,6 @@
1
+root = true
2
+
3
+[*.yml]
4
+indent = 2
5
+shift_wodth = 2
6
+

+ 20
- 0
docker-compose.yml Visa fil

@@ -0,0 +1,20 @@
1
+version: '2'
2
+
3
+services:
4
+    sandbox:
5
+        build: .
6
+        environment:
7
+            DATABASE_ENGINE: django.db.backends.postgresql
8
+            DATABASE_NAME: postgres
9
+            DATABASE_HOST: db
10
+            DATABASE_USER: postgres
11
+            DATABASE_PASSWORD: postgres
12
+        ports:
13
+            - 80:8080
14
+        links:
15
+            - db
16
+            - elasticsearch
17
+    db:
18
+        image: postgres:9.5
19
+    elasticsearch:
20
+        image: elasticsearch:1.7

+ 6
- 6
sites/sandbox/settings.py Visa fil

@@ -25,12 +25,12 @@ MANAGERS = ADMINS
25 25
 # Use a Sqlite database by default
26 26
 DATABASES = {
27 27
     'default': {
28
-        'ENGINE': 'django.db.backends.sqlite3',
29
-        'NAME': location('db.sqlite'),
30
-        'USER': '',
31
-        'PASSWORD': '',
32
-        'HOST': '',
33
-        'PORT': '',
28
+        'ENGINE': os.environ.get('DATABASE_ENGINE', 'django.db.backends.sqlite3'),
29
+        'NAME': os.environ.get('DATABASE_NAME', location('db.sqlite')),
30
+        'USER': os.environ.get('DATABASE_USER', None),
31
+        'PASSWORD': os.environ.get('DATABASE_PASSWORD', None),
32
+        'HOST': os.environ.get('DATABASE_HOST', None),
33
+        'PORT': os.environ.get('DATABASE_PORT', None),
34 34
         'ATOMIC_REQUESTS': True
35 35
     }
36 36
 }

Laddar…
Avbryt
Spara