use volumes instead of data container

Author: legios89

README.md

@@ -31,32 +31,34 @@ A [`cookiecutter`](https://github.com/audreyr/cookiecutter) template for Django/
 ## Usage
 * Build the images: ```bash buildall.sh```
 * Start the project: ```docker-compose up ```
-* You can set every secret variable in the  ```env.txt``` in the root
+* You can set every secret variable in the  ```.secret``` in the root
 * If you want to run the project in production mode you need to set the following environment variable:         
     * ```COMPOSE_FILE="production-docker-compose.yml"```
     * https://docs.docker.com/compose/reference/overview/#compose-file
 
 ## Tips & Tricks
 * Every image has a container_shared directory linked as a volume, so if you want to put something inside the container, or
-you want to get something from inside the containers like a backup file you just need to copy everything to this directory.
+you want to get something from the containers like a backup file you just need to copy everything into this directory.
 * Create a bash alias for for the docker-compose by edit the ```.bash_aliases``` file ```alias dc='docker-compose'```
-* Enter the container as root: ```dc run --rm proxy shell root```
+* Enter the container as root: ```dc run --rm postgres shell root```
 * You can use vim in every container.
 * https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04
 * better prompt: https://github.com/vertisfinance/gitprompt
 
+## Volumes
+- The data volume, automatically created on the first start, which will contains every data.
+- You can find it in every container in here: ```/data/```
+
 ## Images
-1. base
- * Contains every data(db, files, logs) and connected to every other container as a volume (/data/).
- * If you delete the base container you will lose everything (be cautious)
-2. postgres
+1. postgres
  * postgresql-9.4
  * The 5433 port is open by default if you want to connect the db with a client
  * Commands:
+    * start - start the database
     * shell - start a bash shell ```dc run --rm postgres shell```
     * backup - create a backup (```/data/backup/<backup_name>```) ```dc run --rm postgres backup```
     * restore - restore from a backup (```/data/backup/<backup_name>```) ```dc run --rm postgres restore```
-3. django-python3
+2. django-python3
  * The projects can be found under the /src/ directory
  * Installed Apps:
     * Django: 1.10.1
@@ -71,15 +73,18 @@ you want to get something from inside the containers like a backup file you just
     * django-modeltranslation: 0.11 [optional]
  * Commands:
    * shell -start a bash shell ```dc run --rm django shell```
-4. nginx
+   * start_runserver - in development mode this will start django runserver
+   * start_uwsgi - in production mode this will start the uwsgi
+3. nginx
  * Commands:
    * shell -start a bash shell ```dc run --rm nginx shell```
  * Installed Apps:
    * Nginx: 1.8.1
-5. nodejs [optional]
+4. nodejs [optional]
  * Commands:
       * shell -start a bash shell ```dc run --rm nodejs shell```
-      * start_build -start the react build process than exit ```dc run --rm nodejs start_build```
+      * start_build - start the react build process than exit ```dc run --rm nodejs start_build```
+      * start_watchify - start the watchify process for the development mode
    * Installed Apps:
       * nodejs: 4.x.x
       * npm: 2.x.x

{{cookiecutter.repo_name}}/.secret

@@ -1,6 +1,5 @@
 DJANGO_SECRET_KEY={SECRET_KEY}
 DB_PASSWORD={{cookiecutter.db_password}}
-DEBUG=True
 ALLOWED_HOSTS=
 YANDEX_TRANSLATE_KEY=
 EMAIL_HOST_USER={{cookiecutter.email_host_user}}

{{cookiecutter.repo_name}}/buildall.sh

@@ -24,7 +24,3 @@ echo "nodejs"
 echo "--------------------"
 docker build -t {{cookiecutter.repo_name}}-nodejs "docker/nodejs"
 {%- endif %}
-
-echo 'Start the data container'
-echo "--------------------"
-docker-compose --file data-docker-compose.yml up -d

{{cookiecutter.repo_name}}/data-docker-compose.yml

@@ -1,69 +1,70 @@
-proxy:
-  hostname: {{cookiecutter.repo_name}}-proxy
-  image: {{cookiecutter.repo_name}}-base
-  command: start
-  volumes_from:
-      - {{cookiecutter.repo_name}}-data
-  entrypoint: ['python3', '/config/run.py']
+version: '2'
 
-postgres:
-    hostname: {{cookiecutter.repo_name}}-postgres
-    image: {{cookiecutter.repo_name}}-postgres
-    command: start
-    volumes_from:
-        - proxy
-    volumes:
-        - "./docker/postgres/config:/config"
-        - "./container_shared:/container_shared"
-    log_opt:
-        max-size: "5m"
-        max-file: "1"
-    entrypoint: ['python3', '/config/run.py']
-    environment:
-        PGDATA: /data/postgres
-    env_file: .secret
-    ports:
-        - "5433:5432"
+volumes:
+  {{cookiecutter.repo_name}}-data-volume:
+    driver: local
 
-django:
-    hostname: {{cookiecutter.repo_name}}-django
-    image: {{cookiecutter.repo_name}}-django-python3
-    entrypoint: ['python3', '/config/run.py']
-    command: start_runserver
-    user: developer
-    volumes_from:
-        - proxy
-    volumes:
-        - "./src:/src"
-        - "./docker/django-python3/config:/config"
-        - "./container_shared:/container_shared"
-    links:
-        - "postgres:postgres"
-    log_opt:
-        max-size: "5m"
-        max-file: "1"
-    environment:
-        PYTHONPATH: /src
-        DJANGO_SETTINGS_MODULE: core.settings
-        PYTHONUNBUFFERED: "true"
-    env_file: .secret
-    ports:
-        - "80:8000"
+services:
+  postgres:
+      hostname: {{cookiecutter.repo_name}}-postgres
+      image: {{cookiecutter.repo_name}}-postgres
+      command: start
+      volumes:
+          - {{cookiecutter.repo_name}}-data-volume:/data
+          - "./docker/postgres/config:/config"
+          - "./container_shared:/container_shared"
+      logging:
+        options:
+            max-size: "5m"
+            max-file: "1"
+      entrypoint: ['python3', '/config/run.py']
+      environment:
+          PGDATA: /data/postgres
+      env_file: .secret
+      ports:
+          - "5433:5432"
 
-{% if cookiecutter.use_react == 'True' -%}
-nodejs:
-    hostname: {{cookiecutter.repo_name}}-nodejs
-    image: {{cookiecutter.repo_name}}-nodejs
-    command: start_watchify
-    volumes_from:
-        - proxy
-    volumes:
-        - "./docker/nodejs/config:/config"
-        - "./container_shared:/container_shared"
-        - "./react:/react"
-        - "./src:/src"
-    log_opt:
-        max-size: "5m"
-        max-file: "1"
-    entrypoint: ['python3', '/config/run.py']
-    env_file: .secret{% endif -%}
+  django:
+      hostname: {{cookiecutter.repo_name}}-django
+      image: {{cookiecutter.repo_name}}-django-python3
+      entrypoint: ['python3', '/config/run.py']
+      command: start_runserver
+      user: developer
+      volumes:
+          - {{cookiecutter.repo_name}}-data-volume:/data
+          - "./src:/src"
+          - "./docker/django-python3/config:/config"
+          - "./container_shared:/container_shared"
+      links:
+          - "postgres:postgres"
+      logging:
+        options:
+            max-size: "5m"
+            max-file: "1"
+      environment:
+          PYTHONPATH: /src
+          DJANGO_SETTINGS_MODULE: core.settings
+          PYTHONUNBUFFERED: "True"
+          DEBUG: "True"
+      env_file: .secret
+      ports:
+          - "80:8000"
+
+  {% if cookiecutter.use_react == 'True' -%}
+  nodejs:
+      hostname: {{cookiecutter.repo_name}}-nodejs
+      image: {{cookiecutter.repo_name}}-nodejs
+      command: start_watchify
+      volumes:
+          - {{cookiecutter.repo_name}}-data-volume:/data
+          - "./docker/nodejs/config:/config"
+          - "./container_shared:/container_shared"
+          - "./react:/react"
+          - "./src:/src"
+      logging:
+        options:
+            max-size: "5m"
+            max-file: "1"
+      entrypoint: ['python3', '/config/run.py']
+      env_file: .secret
+{% endif -%}

{{cookiecutter.repo_name}}/docker-compose.yml

@@ -44,6 +44,7 @@ def generate_makemessages_command(domain):
 
 # INIT: WILL RUN BEFORE ANY COMMAND AND START  #
 def init(stopper):
+    ensure_dir('/data/logs/', owner='developer', group='developer')
     ensure_dir('/data/logs/django', owner='developer', group='developer')
     ensure_dir('/data/static', owner='developer', group='developer')
     {% if cookiecutter.use_translation == 'True' -%}
@@ -58,7 +59,6 @@ def init(stopper):
             cmd = ['django-admin', 'collectstatic', '--noinput']
             {% endif -%}
             run_cmd(cmd, user='developer')
-            run_cmd(['django-admin', 'migrate'], user='developer')
 
         # Create db cache
         if os.path.isfile('/data/.init') is False:

{{cookiecutter.repo_name}}/docker/base/config/run.py

@@ -8,6 +8,7 @@
 
 @click.group()
 def run():
+    ensure_dir('/data/logs/', owner='developer', group='developer')
     ensure_dir('/data/logs/nginx/', owner='developer', group='developer')
 
 

{{cookiecutter.repo_name}}/docker/django-python3/config/run.py

@@ -133,6 +133,7 @@ def _restore(backupname):
 # INIT: WILL RUN BEFORE ANY COMMAND AND START  #
 ################################################
 def init(stopper=None):
+    ensure_dir('/data/logs/', owner='developer', group='developer')
     ensure_dir(os.path.split(PGDATA)[0], owner='postgres', group='postgres')
     ensure_dir(SOCKET_DIR, owner='postgres', group='postgres')
     ensure_dir(BACKUP_DIR, owner='postgres', group='postgres')