.bowerrc

@@ -1,4 +1,4 @@
 {
   "allow_root": true,
-  "directory" : "radioco/apps/radioco/static/bower"
+  "directory" : "tmp_bower"
 }

.coveragerc

@@ -1,4 +1,7 @@
 [paths]
 source =
     radioco/
-    /radioco/radioco/
+    /radioco/radioco/
+[run]
+source =
+    radioco

.dockerignore

@@ -0,0 +1,13 @@
+**/node_modules
+**/__pycache__
+**/.cache
+test_reports/
+venv/
+env/
+**/.pyc
+**/.kdbx
+**/.ipynb
+**/db.sqlite3
+**/.vscode
+radioco/static/
+radioco/apps/radioco/static/bower/

.gitignore

@@ -1,7 +1,8 @@
 # django collectstatic files
-radioco/media/_versions/
-radioco/components/
-radioco/static/
+/radioco/media/_versions/
+/radioco/components/
+/radioco/static/
+/radioco/media/
 
 # source locale
 radioco/locale/en/*
@@ -52,6 +53,7 @@ pip-log.txt
 pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+reports/
 htmlcov/
 nosetests.xml
 coverage.xml
@@ -65,7 +67,3 @@ docs/_build/
 
 # Files ending in ~
 *~
-
-# Docker tmp files (just in case)
-id_rsa.pub
-tmp_requirements.txt

.sample.env

@@ -0,0 +1,10 @@
+LANG=C.UTF-8
+COMPOSE_PROJECT_NAME=radioco
+
+SECRET_KEY=REPLACE_ME
+DJANGO_LOG_LEVEL=ERROR
+TIME_ZONE=Europe/Madrid
+DISQUS_API_KEY=
+DISQUS_WEBSITE_SHORTNAME=
+
+PORT_BACKEND=8000

.travis.yml

@@ -6,29 +6,19 @@ services:
   - docker
 
 python:
-  - "2.7"
+  - "3.6"
 
 branches:
   only:
     - master
     - develop
 
 install:
-  - pip install -r radioco/configs/base/requirements.txt
-  - pip install coverage coveralls invoke
+  - pip install coveralls
 
 script:
-  - COVERAGE_FILE=.coverage.base.xml coverage run --source="radioco" manage.py test
-  - inv --echo docker.setup -e base
-  - inv --echo docker.run_coverage -e base
-  - inv --echo docker.destroy -e base
-  - inv --echo docker.setup -e staging
-  - inv --echo docker.run_coverage -e staging
-  - inv --echo docker.destroy -e staging
-  - PORT_POSTGRES=9999 inv --echo docker.setup -e development
-  - inv --echo docker.run_coverage -e development
-  - inv --echo docker.destroy -e development
-  - coverage combine
+  - cp -v .sample.env .env
+  - docker-compose run -e COVERAGE_FILE=reports/coverage.xml --rm --volume "$(pwd)/reports:/radioco/reports" django coverage run manage.py test radioco
 
 after_success:
-  coveralls
+  cd reports && coveralls

README.rst

@@ -37,10 +37,11 @@ Install `Docker engine <https://docs.docker.com/engine/installation/>`_.
 
 Open a terminal and introduce the following commands::
 
-    pip install invoke==0.14.0
     git clone https://github.com/iago1460/django-radio
     cd django-radio
-    inv quickstart
+    chmod +x ./run
+    ./run start_dev
+    ./run manage create_example_data
 
 
 Now that the server’s running (don't close the terminal), visit http://127.0.0.1:8000/
@@ -51,7 +52,7 @@ To access administrator site visit http://127.0.0.1:8000/admin/ using "admin/123
 Documentation
 *************
 
-Please head over to our `documentation <http://django-radio.readthedocs.org/>`_ for all
+Please head over to our `documentation <https://django-radio.readthedocs.io/>`_ for all
 the details on how to install, extend and use RadioCo.
 
 

docker-compose.override.yaml

@@ -0,0 +1,16 @@
+version: '3.4'
+services:
+
+
+  # Backend server -------------------------------------------------------------
+
+  django:
+    environment:
+      - DEBUG=True
+    volumes:
+      - ./:/radioco/
+    ports:
+      - ${PORT_BACKEND}:8000
+    command: /bin/sh -c "cd /radioco && ./docker/scripts/launch_dev_server.sh"
+    #stdin_open: true
+    #tty: true  # ERROR: An HTTP request took too long to complete. https://github.com/docker/compose/issues/3633

docker-compose.staging.yaml

@@ -0,0 +1,31 @@
+version: '3.4'
+services:
+
+
+  # Backend server -------------------------------------------------------------
+
+  django:
+    environment:
+      - DEBUG=False
+    volumes:
+      - ./radioco/static/:/radioco/radioco/static/
+    command: /bin/sh -c "cd /radioco && ./docker/scripts/launch_server.sh"
+
+  nginx:
+    image: nginx:1.13.1-alpine
+    restart: always
+    volumes:
+      - ./docker/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./radioco/static:/static:ro
+      - ./radioco/media:/media:ro
+    ports:
+      - ${PORT_BACKEND}:8000
+    env_file:
+      - .env
+    command: /bin/sh -c "nginx -g 'daemon off;'"
+    links:
+      - django
+
+  memcached:
+    image: memcached:1.4.37-alpine
+    command: memcached -m 512m

docker-compose.yaml

@@ -0,0 +1,36 @@
+version: '3.4'
+services:
+
+
+  # Backend server -------------------------------------------------------------
+
+  django:
+    build:
+      context: .
+      dockerfile: docker/django.Dockerfile
+    environment:
+      - SECRET_KEY=$SECRET_KEY
+      - DJANGO_LOG_LEVEL=$DJANGO_LOG_LEVEL
+      - TIME_ZONE=$TIME_ZONE
+      - DISQUS_API_KEY=$DISQUS_API_KEY
+      - DISQUS_WEBSITE_SHORTNAME=$DISQUS_WEBSITE_SHORTNAME
+    volumes:
+      - ./radioco/media/:/radioco/radioco/media/
+    links:
+      - postgres
+
+  postgres:
+    image: postgres:11.0
+    restart: always
+    environment:
+      POSTGRES_DB: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+    volumes:
+      - database_data:/var/lib/postgresql/data
+
+# Volumes ---------------------------------------------------------------------
+
+volumes:
+  database_data:
+    name: database_data

docker/django.Dockerfile

@@ -0,0 +1,28 @@
+FROM python:3.6.10-buster
+
+RUN apt-get update && apt-get install -yq --fix-missing --no-install-recommends \
+    python3-setuptools \
+    python3-pip \
+    git-core \
+    netcat \
+    nodejs \
+    npm \
+    gettext \
+&& apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Installing libraries
+
+RUN npm install -g bower
+
+# Install pip dependencies
+RUN pip3 install --upgrade pip setuptools virtualenv
+
+COPY .bowerrc bower.json /
+RUN bower install
+
+COPY requirements.txt /
+RUN pip3 install -r requirements.txt
+
+COPY ./ /radioco/
+
+WORKDIR /radioco/

radioco/configs/staging/docker/nginx.conf → docker/nginx.conf

@@ -35,10 +35,10 @@ http {
     uwsgi_cache_path /tmp/cache2 levels=1:2 keys_zone=api:10m max_size=1g inactive=24h use_temp_path=off;
 
     upstream django {
-        server staging_django:${PORT_BACKEND};
+        server django:8000;
     }
     server {
-        listen ${PORT_NGINX};
+        listen 8000;
         charset utf-8;
 
         include /etc/nginx/uwsgi_params;

docker/scripts/launch_dev_server.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -x
+
+script_full_path=$(dirname "$0")
+$script_full_path/wait_for.sh postgres 5432
+
+TARGET_DIR="/radioco/radioco/apps/radioco/static/bower"
+
+if [ -d "$TARGET_DIR" ]; then
+  rm -rf "$TARGET_DIR"
+fi
+
+mv -f /tmp_bower "$TARGET_DIR"
+
+python3 manage.py migrate
+python3 manage.py runserver 0.0.0.0:8000

docker/scripts/launch_server.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -x
+
+script_full_path=$(dirname "$0")
+$script_full_path/wait_for.sh postgres 5432
+
+mv -f /tmp_bower /radioco/radioco/apps/radioco/static/bower
+python3 manage.py migrate
+python3 manage.py collectstatic --noinput
+uwsgi --socket 0.0.0.0:8000 --module radioco.configs.base.wsgi --master --processes 2 --threads 1

docker/scripts/wait_for.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+HOST=$1
+PORT=$2
+
+if [[ "$HOST" == "" ]]; then
+    echo "wait_for: Missing host"
+    exit 1
+fi
+
+if [[ "$PORT" == "" ]]; then
+    echo "wait_for: Missing port"
+    exit 1
+fi
+
+counter=0
+echo -n "Waiting for $HOST:$PORT..."
+while ! nc -z $HOST $PORT > /dev/null; do
+    echo -n "."
+    sleep 1
+    ((counter+=1))
+    if (( counter > 60 )); then
+        echo " Failed"
+        exit 1
+    fi
+done
+echo " Ready"

docs/source/conf.py

@@ -23,13 +23,13 @@
 path = os.path.split(os.path.dirname(__file__))[0]
 path = os.path.split(path)[0]
 sys.path.insert(0, path)
-import django
+# import django
 import radioco
 
 # sys.path.insert(0, '{0}/radioco'.format(path))
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'radioco.configs.base.settings'
-django.setup()
+# os.environ['DJANGO_SETTINGS_MODULE'] = 'radioco.configs.base.settings'
+# django.setup()
 
 # -- General configuration ------------------------------------------------
 
@@ -40,7 +40,7 @@
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
+    # 'sphinx.ext.autodoc',
     'sphinx.ext.doctest',
     'sphinx.ext.viewcode',
 ]