start api server in dockerfile

sunForest · May 10, 2015 · 1414191 · 1414191
1 parent 8258a4c
commit 1414191
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,13 +6,13 @@ apt-get install -y \
 	libpq-dev \
     libgeos-dev \
 	nginx
-
+COPY deployment/avipost.conf /etc/nginx/sites-enabled/
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
-ADD . /usr/src/app
+ADD . /usr/src/app/
 RUN pip install -r requirements/prod.txt
+RUN cd avipost/ && DJANGO_SETTINGS_MODULE=avipost.settings.ci gunicorn avipost.wsgi:application
+RUN service nginx start
 
-# TODO copy nginx configuration
-
-CMD ['nginx', '-g', 'daemon off;']
+# CMD ['nginx', '-g', 'daemon off;']
diff --git a/avipost/avipost/settings/dev_ssen.py b/avipost/avipost/settings/dev_ssen.py
@@ -10,7 +10,7 @@
         'ENGINE': 'django.contrib.gis.db.backends.postgis',
         'NAME': 'avipost',
         'USER': 'geodjango',
-        'PASSWORD': get_env_variable('DB_PASSWORD'),
+        'PASSWORD': 'X2ekaerp',
         'HOST': '127.0.0.1',
         'PORT': '5432',
     }

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -5,6 +5,7 @@ coverage==3.7.1
 coveralls==0.5
 djangorestframework==3.1.1
 docopt==0.6.2
+gunicorn==19.3.0
 psycopg2==2.6
 requests==2.6.0
 wsgiref==0.1.2