Merge pull request #129 from ScanOC/django3

Upgrade to v0.1.2

Author: dreinhold

.gitignore

@@ -26,3 +26,4 @@ trunk_player/supervisor.conf
 daphne.lock
 *.log*
 running.pid
+.vscode/settings.json

Dockerfile

@@ -1,22 +1,32 @@
-FROM dreinhold/base-django:1.1
-
+FROM python:3.10
+RUN apt-get update && \
+    apt-get -y install nginx redis-server ssl-cert tzdata && \
+    rm -rf /var/lib/apt/lists/* 
 
 RUN mkdir -p /app/trunkplayer
-# set work directory
 WORKDIR /app/trunkplayer
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
+# install dependencies
+ADD requirements.txt /app/trunkplayer
+RUN pip install --upgrade pip && pip install -r requirements.txt
+
+RUN mkdir -p /var/log/trunk-player/
+
+# Make SSL
+RUN make-ssl-cert generate-default-snakeoil --force-overwrite 
+
 # copy project
 #COPY . .
 ADD . /app/trunkplayer
 RUN rm -f /etc/nginx/sites-enabled/default
 COPY trunk_player/trunk_player.nginx.docker /etc/nginx/conf.d/nginx.conf
 
-# install dependencies
-RUN pip install --upgrade pip && pip install -r requirements.txt
+EXPOSE 80
+EXPOSE 443
 
 ENTRYPOINT ["./entrypoint.sh"]
 

README.md

@@ -1,6 +1,8 @@
 Trunk Player
 ============
 
+### Version 0.1.2
+
 Python Django web frontend for playing recorded radio transmisisons. The audio files are recorded using [Trunk Recoder](https://github.com/robotastic/trunk-recorder).
 
 ![Main Screen](/../master/docs/images/trunk_player_main.png?raw=true "Main Screen")
@@ -21,3 +23,6 @@ Check out https://github.com/MaxwellDPS/Unibridge for using Trunk-Player with un
 
 ## WIP
  - The code still has a lot of work. If you have issues or question feel free to post in the google group.
+
+## Discuss
+ - Join our [gitter](https://gitter.im/TrunkPlayer/Lobby)

docker-compose.yml

@@ -4,25 +4,49 @@ services:
   db:
     image: postgres
     environment:
+      - POSTGRES_DB=tr
+      - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=password1234
 
   app:
     build:
       context: .
+    #image: maxwelldps/trunk-player:latest
     ports:
-      - "80:80"
+      - 80:80
+      - 8443:443
     volumes:
-      - .:/app/trunkplayer
-    # command: 
-    # entrypoint: sh -c "python manage.py runserver 0.0.0.0:8000"
+      #- .:/app/trunkplayer
+      - audio:/app/trunkplayer/audio_files
     environment:
-      - DEBUG=0
+      - DEBUG=True
       - SQL_ENGINE=django.db.backends.postgresql_psycopg2
       - SQL_DATABASE=tr
       - SQL_USER=postgres
       - SQL_PASSWORD=password1234
       - SQL_HOST=db
+      - REDIS_URL=redis://127.0.0.1:6379
       - MIGRATE_DB=1
+      - SECRET_KEY="%2%xjx4c3obf_xa8hsdbd@ci+8!4)@x16_!auo*h(%*p_z(g"
+      - DJANGO_ALLOWED_HOSTS=*
+      - TZ=America/Chicago
+      - FORCE_SECURE=False
+      - ANONYMOUS_TIME=0
+      - SITE_TITLE=TESTING
+      - [email protected]
+      - AUDIO_URL_BASE=/audio/
+      - ALLOW_ANONYMOUS=False
+      - ACCESS_TG_RESTRICT=False
+      - TALKGROUP_RECENT_LENGTH=0
+      - OPEN_SITE=False
+      - ALLOW_GOOGLE_SIGNIN=False
+      - FIX_AUDIO_NAME=False
+      - TRANS_DATETIME_FORMAT=%H:%M:%S %m/%d/%Y
+      - GOOGLE_ANALYTICS_PROPERTY_ID=0
+      - USE_RAW_ID_FIELDS=False
+
     depends_on:
       - db
 
+volumes: 
+  audio:

docs/config_local.rst

@@ -93,7 +93,7 @@ Now start atleast 1 runworker
 
 .. code-block:: console
 
-  $ ./manage.py runworker
+  $ ./manage.py runworker livecall-scan-default
 
 Adding new transmissions
 ========================

docs/index.rst

@@ -9,7 +9,7 @@ Welcome to Trunk Player's documentation!
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 4
 
    install
    configure
@@ -19,6 +19,10 @@ Contents:
    settings
    supervisor
 
+Upgrades
+========
+.. toctree::
+   upgrade/upgrade-0.1.2.rst
 
 
 Indices and tables

docs/settings.rst

@@ -246,17 +246,7 @@ SITE_ID
 
 [D] ID of this site
 
-PINAX_STRIPE_SECRET_KEY
-=======================
-
-[D3] If using payment plans, stripe key
-
-PINAX_STRIPE_PUBLIC_KEY
-=======================
-
-[D3] If using payment plans, stripe key
-
-PINAX_STRIPE_INVOICE_FROM_EMAIL
-===============================
+USE_RAW_ID_FIELDS
+=================
 
-[D3] If using payment plans, email the invoice will be sent from
+[D] For very large systems, the admin page may load better with raw id fields