Refactor Docker Compose configuration to use production image

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

docker-compose.yml

@@ -1,49 +1,57 @@
-version: '3.1'
+version: '3.2'
 services:
-
   db:
-    image: mariadb:10.3
+    image: 'mariadb:10.4.1'
-    container_name: satnogs_network_mysql
     environment:
-    - MYSQL_DATABASE=network
+      MYSQL_DATABASE: 'satnogsnetwork'
-    - MYSQL_USER=network
+      MYSQL_USER: 'satnogsnetwork'
-    - MYSQL_PASSWORD=network
+      MYSQL_PASSWORD: 'satnogsnetwork'
-    - MYSQL_ROOT_PASSWORD=toor
+      MYSQL_ROOT_PASSWORD: 'toor'
-
   redis:
-    image: redis:3.2.10
+    image: 'redis:3.2.12'
-    container_name: satnogs_network_redis
-
   celery:
     build:
-      context: .
+      context: '.'
-      dockerfile: docker/dev
-    container_name: satnogs_network_celery
-    volumes:
-      - .:/app
     links:
-      - db
+      - 'db'
-      - redis
+      - 'redis'
     environment:
-      - DATABASE_URL=mysql://network:network@db/network
+      PYTHONDONTWRITEBYTECODE: '1'
-      - CELERY_BROKER_URL=redis://redis:6379/0
+      DATABASE_URL: 'mysql://satnogsnetwork:satnogsnetwork@db/satnogsnetwork'
-      - CELERY_RESULT_BACKEND=redis://redis:6379/0
+      CELERY_BROKER_URL: 'redis://redis:6379/0'
-    command:
+      CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
-      ./bin/run-celery.sh
+      CACHE_BACKEND: 'redis_cache.RedisCache'
-
+      CACHE_CLIENT_CLASS: 'django_redis.client.DefaultClient'
+      CACHE_LOCATION: 'redis://redis:6379/1'
+      MEDIA_ROOT: '/var/lib/satnogs-network/media'
+    command: ["djangoctl.sh", "develop_celery", "/usr/local/src/satnogs-network"]
+    volumes:
+      - '.:/usr/local/src/satnogs-network:z'
+      - 'media:/var/lib/satnogs-network/media'
   web:
     build:
-      context: .
+      context: '.'
-      dockerfile: docker/dev
+    image: 'satnogs-network'
-    container_name: satnogs_network_web
     ports:
-      - "8000:8000"
+      - '8000:8000'
-    volumes:
-      - .:/app
     links:
-      - db
+      - 'db'
-      - redis
+      - 'redis'
     environment:
-      - DATABASE_URL=mysql://network:network@db/network
+      PYTHONDONTWRITEBYTECODE: '1'
-    command:
+      DATABASE_URL: 'mysql://satnogsnetwork:satnogsnetwork@db/satnogsnetwork'
-      ./bin/run-docker.sh
+      CELERY_BROKER_URL: 'redis://redis:6379/0'
+      CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
+      CACHE_BACKEND: 'redis_cache.RedisCache'
+      CACHE_CLIENT_CLASS: 'django_redis.client.DefaultClient'
+      CACHE_LOCATION: 'redis://redis:6379/1'
+      STATIC_ROOT: '/var/lib/satnogs-network/staticfiles'
+      MEDIA_ROOT: '/var/lib/satnogs-network/media'
+    command: ["djangoctl.sh", "develop", "/usr/local/src/satnogs-network"]
+    volumes:
+      - '.:/usr/local/src/satnogs-network:z'
+      - 'static:/var/lib/satnogs-network/static'
+      - 'media:/var/lib/satnogs-network/media'
+volumes:
+  static:
+  media:

docs/installation-docker.rst

@@ -6,37 +6,29 @@ Docker Installation
    You will need `docker <https://docs.docker.com/installation/#installation>`_ and `docker-compose <https://docs.docker.com/compose/install/>`_.
 
 
-#. **Build the containers**
+#. **Get the source code**
 
    Clone source code from the `repository <https://gitlab.com/librespacefoundation/satnogs/satnogs-network>`_::
 
      $ git clone https://gitlab.com/librespacefoundation/satnogs/satnogs-network.git
      $ cd satnogs-network
 
+#. **Configure settings**
+
    Set your environmental variables::
 
      $ cp env-dist .env
 
-   Start database container (Run it in the background)::
-
-     $ docker-compose up --detach db
-
-   Build satnogs-network container::
-
-     $ docker-compose build web
-
-   Run the initialize script to populate the database with scheme and demo data::
-
-     $ docker-compose run web python manage.py initialize
-
-   Note that the above command requires internet connection, since it fetches
-   Satellite and Transmitter data from `SatNOGS-DB <https://db.satnogs.org/>`_
-
-
 #. **Run it!**
 
-   Run satnogs-network (in the foreground)::
+   Run satnogs-network::
 
-     $ docker-compose up
+     $ docker-compose up -d --build
+
+#. **Populate database**
+
+   Create, setup and populate the database with demo data::
+
+     $ docker-compose exec web djangoctl.sh initialize
 
    Your satnogs-network development instance is available in localhost:8000. Go hack!