Refeactor code for nginx docker container.

Author: luvwinnie

.env

@@ -0,0 +1,12 @@
+# DOMAIN such as example.com or local development 192.168.1.2
+DOMAIN=review.px4.io
+PORT=5006
+EMAIL=
+CERT_PATH=./data/certbot
+USE_PROXY="True"
+# uncomment this for local development
+# BOKEH_ALLOW_WS_ORIGIN=192.168.1.2:5006
+
+# Nginx config to use default.conf or default_ssl.conf
+# Please modify the file in nginx/default.conf or nginx/default_ssl.conf for your use cases
+NGINX_CONF=default.conf

.gitignore

@@ -10,3 +10,6 @@ __pycache__
 /config_user.ini
 
 data/img/*
+
+data/app_data
+data/certbot

README.md

@@ -51,7 +51,7 @@ brew install fftw
 ```bash
 # After git clone, enter the directory
 git clone https://github.com/PX4/flight_review.git
-cd flight_review
+cd flight_review/app
 pip install -r requirements.txt
 # Note: preferably use a virtualenv
 ```
@@ -74,11 +74,13 @@ For local usage, the server can be started directly with a log file name,
 without having to upload it first:
 
 ```bash
+cd app
 ./serve.py -f <file.ulg>
 ```
 
 To start the whole web application:
 ```bash
+cd app
 ./serve.py --show
 ```
 
@@ -138,6 +140,58 @@ the root directory (Eg `tornado_handlers.py`). Then to make sure the same module
 is only loaded once, we use `import xy` instead of `import plot_app.xy`.
 It's useful to look at `print('\n'.join(sys.modules.keys()))` to check this.
 
+# Description
+
+This section explain about how to work with docker.
+
+# Arguments
+
+- PORT - The number of port, what listen service in docker, default 5006
+- USE_PROXY - The set his, if you use reverse proxy (Nginx, ...)
+- DOMAIN - The address domain name for origin, default = *
+- CERT_PATH - The SSL certificate volume path
+- EMAIL - Email for challenging Let's Encrypt DNS
+
+# Paths
+
+- /opt/service/config_user.ini - Path for config
+- /opt/service/data - Folder where stored database
+- .env - Environment variables for nginx and app docker container
+
+# Build Docker Image
+
+```bash
+cd app
+docker build -t px4flightreview -f Dockerfile .
+```
+
+# Work with docker-compose 
+Run with following command to start docker container.
+Please modify the .env and app/config_default.ini or add app/config_user.ini with respective stages.
+
+***
+
+Uncomment the BOKEH_ALLOW_WS_ORIGIN with your local IP Address when developing, this is for the bokeh application's websocket to work.
+### Development
+```bash
+docker-compose -f docker-compose.dev.yml up
+```
+***
+Test locally with nginx.
+
+### Test Locally
+```bash
+docker-compose up
+```
+
+Remember to Change NGINX_CONF to use default_ssl.conf and add the EMAIL for production.
+
+### Production
+```bash
+chmod u+x init-letsencrypt.sh
+./init-letsencrypt.sh
+```
+
 
 ## Contributing
 Contributions are welcome! Just open a pull request with detailed description

app/Dockerfile.dev

@@ -1,38 +1,37 @@
-
 {% include 'header.html' %}
 
 <h3>Browse public Log Files</h3>
 
 <p>
-Use <a href="https://github.com/PX4/flight_review/blob/master/download_logs.py">
-this script</a> for automated download of public log files.
+    Use <a href="https://github.com/PX4/flight_review/blob/master/download_logs.py">
+        this script</a> for automated download of public log files.
 </p>
 
 <p>
 
 </p>
 
 <table id="logs_table" style="border-collapse: collapse !important"
-	class="table table-sm table-striped table-bordered table-condensed">
-        <thead>
-            <tr>
-                <th>#</th>
-                <th>Upload Date</th>
-                <th>Overview</th>
-                <th>Description</th>
-                <th>Type</th>
-                <th>Airframe</th>
-                <th>Hardware</th>
-                <th>Software</th>
-                <th>Duration</th>
-                <th>Start Time</th>
-                <th>Rating</th>
-                <th>Errors</th>
-                <th>Flight Modes</th>
-            </tr>
-        </thead>
-        <tbody>
-        </tbody>
+    class="table table-sm table-striped table-bordered table-condensed">
+    <thead>
+        <tr>
+            <th>#</th>
+            <th>Upload Date</th>
+            <th>Overview</th>
+            <th>Description</th>
+            <th>Type</th>
+            <th>Airframe</th>
+            <th>Hardware</th>
+            <th>Software</th>
+            <th>Duration</th>
+            <th>Start Time</th>
+            <th>Rating</th>
+            <th>Errors</th>
+            <th>Flight Modes</th>
+        </tr>
+    </thead>
+    <tbody>
+    </tbody>
 </table>
 
 
@@ -44,51 +43,50 @@ <h3>Browse public Log Files</h3>
 
 <script type="text/javascript" charset="utf-8" src="//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
 
-<script type="text/javascript" charset="utf-8" src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap4.min.js"></script>
+<script type="text/javascript" charset="utf-8"
+    src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap4.min.js"></script>
 
 
 <script type="text/javascript">
 
-$(document).ready(function() {
-	$('#logs_table').DataTable({
+    $(document).ready(function () {
+        $('#logs_table').DataTable({
 {% if initial_search %}
         "search": {
-            "search": {{ initial_search }}
+        "search": {{ initial_search }}
         },
-{% endif %}
-            "order": [[1, 'desc']], 
-            "ordering": true,
-            "lengthMenu": [10, 25, 50, 75, 100],
-
-            "columns": [
-                {"orderable": false }, /* row number */
-                null,
-                { "orderable": false }, /* overview */
-                { "width": "13%" }, /* description */
-                null,
-                { "orderable": false },/* airframe - not from DB */
-                null,
-                null,
-                null,
-                { "width": "10%" }, /* start time */
-                { "orderable": false, "width": "13%" }, /* rating */
-                null,
-                { "orderable": false, "width": "11%" } /* flight modes */
-            ],
-
-            "language": {
-                "infoFiltered": "<br>(filtered from _MAX_ total entries)",
-            },
-
-            "serverSide": true,
-            "ajax": "browse_data_retrieval",
+        {% endif %}
+        "order": [[1, 'desc']],
+        "ordering": true,
+        "lengthMenu": [10, 25, 50, 75, 100],
+
+        "columns": [
+        { "orderable": false }, /* row number */
+        null,
+        { "orderable": false }, /* overview */
+        { "width": "13%" }, /* description */
+        null,
+        { "orderable": false },/* airframe - not from DB */
+        null,
+        null,
+        null,
+        { "width": "10%" }, /* start time */
+        { "orderable": false, "width": "13%" }, /* rating */
+        null,
+        { "orderable": false, "width": "11%" } /* flight modes */
+    ],
+
+        "language": {
+        "infoFiltered": "<br>(filtered from _MAX_ total entries)",
+    },
+
+        "serverSide": true,
+        "ajax": "browse_data_retrieval",
     });
     var table = $('#logs_table').DataTable();
     table.on('xhr', function () {
-        
         try {
             var table = $('#logs_table').DataTable();
-            console.log(table);
             var search_term = table.search();
             var url = new URL(window.location.href);
             if (search_term === '') {
@@ -106,4 +104,5 @@ <h3>Browse public Log Files</h3>
 </script>
 
 </body>
-</html>
+
+</html>

app/plot_app/templates/browse.html

@@ -1,24 +1,14 @@
 version: "3.3"
 services:
-  # nginx:
-  #   image: nginx
-  srv:
+  flight_review_app:
     build:
       context: ./app
-      dockerfile: Dockerfile.dev
-    restart: always
-    network_mode: bridge
+      dockerfile: Dockerfile
+    env_file: .env
     ports:
-      - 5006:5006
-    environment:
-      USE_PROXY: "True"
-      PORT: "5006"
-      DOMAIN: "192.168.1.30"
-      BOKEH_ALLOW_WS_ORIGIN: "localhost:5006" # for local development
-      BOKEH_LOG_LEVEL: "debug"
-      # BOKEH_ALLOW_WS_ORIGIN: "192.168.1.30:5006" # for local development
-    command: /opt/service/run.sh
+     - 5006:5006
     volumes:
       - ./app:/opt/service/
       - ./data:/opt/service/data
-      # - ./app/config_default.ini:/opt/service/config_default.ini:ro
+      - ${PWD}/config_default.ini:/opt/service/config_default.ini:ro # Absolute for volume a file.
+    restart: always

app/config_default.ini config_default.ini

@@ -0,0 +1,46 @@
+version: "3.3"
+services:
+  flight_review_app:
+    # image: px4flightreview
+    build:
+      context: ./app
+      dockerfile: Dockerfile
+    env_file: .env_prod
+    volumes:
+      - ./data:/opt/service/data
+      # Absolute for volume a file.
+      - ${PWD}/config_default.ini:/opt/service/config_default.ini:ro
+      - ${PWD}/config_user.ini:/opt/service/config_user.ini:ro
+    restart: always
+  certbot:
+    image: certbot/certbot
+    volumes:
+      - ./data/certbot/conf:/etc/letsencrypt
+      - ./data/certbot/www:/var/www/certbot
+      - ./logs/letsencrypt:/var/log/letsencrypt
+      - /etc/localtime:/etc/localtime:ro # for synchronize with host timezone
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
+    restart: always
+  nginx:
+    build:
+      context: ./nginx
+      dockerfile: Dockerfile
+      args:
+        - NGINX_CONF=${NGINX_CONF}
+    env_file: .env_prod
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - ./data/certbot/conf:/etc/letsencrypt
+      - ./data/certbot/www:/var/www/certbot
+      - ./logs/nginx:/var/log/nginx/
+      - /etc/localtime:/etc/localtime:ro # for synchronize with host timezone
+    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
+    links:
+      - flight_review_app
+    depends_on:
+      - flight_review_app
+    restart: always
+
+