Merge pull request #381 from PyAr/docker_compose

fix docker-compose config
Voy a crear un issue para lo que falta, así queda registrado

Dockerfile

@@ -1,13 +1,20 @@
-FROM python:3.4-wheezy
+FROM python:3.4
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONPATH /code:$PYTHONPATH
+# runtime dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    python3-dev \
+    libxml2-dev \
+    libxslt1-dev \ 
+    zlib1g-dev \
+    libffi-dev \ 
+    && rm -rf /var/lib/apt/lists/*
 
-VOLUME ["/opt/code"]
-
-RUN apt-get update && apt-get install -y apt-utils cmake gcc make tk-dev libjpeg-dev zlib1g-dev libtiff5-dev libfreetype6-dev liblcms2-dev libwebp-dev libtk-img-doc libopenjpeg-dev
-
-ADD ./scripts/install-openjpeg.sh /tmp/
-RUN /tmp/install-openjpeg.sh
-
-COPY ./scripts/webcli.py /webcli
-
-CMD [ "/bin/bash" ]
-EXPOSE 8000
+RUN mkdir /code
+WORKDIR /code
+# update pip (to use wheels)
+RUN wget -O - https://bootstrap.pypa.io/get-pip.py | python3
+COPY dev_requirements.txt /code
+COPY requirements.txt /code
+RUN pip install -r dev_requirements.txt
+COPY . /code/

docker-compose.yml

@@ -2,35 +2,31 @@ version: '2'
 
 volumes:
   pgdata:
-  redisdata:
 
 services:
-  web:
-      build: .
-      command: python3 manage.py runserver 0.0.0.0:8000
-      volumes:
-          - .:/code
-      ports:
-          - "8000:8000"
-      env_file: .env
-      links:
-        - postgres
-        - redis
-
   postgres:
       restart: always
-      image: postgres:latest
+      image: postgres:9.4.4
       ports:
-        - "5432:5433"
+        - "5432:5432"
       volumes:
         - pgdata:/var/lib/postgresql/data/
+      environment:
+        - POSTGRES_PASSWORD=secret
 
-  redis:
-      restart: always
-      image: redis:latest
-      ports:
-        - "6379:6379"
+  web:
+      build: .
+      command: python3 manage.py runserver 0.0.0.0:8000
       volumes:
-        - redisdata:/data
-
-
+        - .:/code
+      ports:
+        - "8000:8000"
+      links:
+        - postgres
+      depends_on:
+        - postgres
+      environment:
+        - DB_USER=postgres
+        - DB_NAME=postgres
+        - DB_PASS=secret
+        - DB_SERVICE=postgres

initialize.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 python3 manage.py migrate
-python3 manage.py loaddata fixtures/initial_data.json
+python3 manage.py createsuperuser

pyarweb/settings.py

@@ -26,7 +26,7 @@
 # Sites framework
 SITE_ID = 1
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['*']
 
 # Django registration
 # https://django-registration.readthedocs.org/en/latest/quickstart.html