adapted images on dev for using the new scalelite core image

data/proxy/nginx/sites.template.scalelite-proxy

@@ -47,12 +47,12 @@ server {
         include /etc/nginx/sites-common;
     }
 
-    location /presentation {
+    location /presentation/ {
         proxy_pass  http://docker-scalelite-recordings;
         include /etc/nginx/sites-common;
     }
 
-    location /playback {
+    location /playback/ {
         proxy_pass  http://docker-scalelite-recordings;
         include /etc/nginx/sites-common;
     }

docker-compose-dev.yml

@@ -71,7 +71,7 @@ services:
       - certbot
       - scalelite-api
       - scalelite-recordings
-    command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites.template > /etc/nginx/conf.d/sites.conf && exec nginx -g 'daemon off;'"
+    command: /bin/bash -c "envsubst '$$NGINX_HOSTNAME' < /etc/nginx/sites.template > /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'"
     logging:
       driver: journald
 
@@ -85,8 +85,18 @@ services:
     depends_on:
       - scalelite-api
 
+  scalelite-recordings:
+    image: ${SCALELITE_RECORDINGS_DOCKER_IMAGE:-bigbluebutton/bbb-playback-proxy:bionic-230-amazonlinux}
+    container_name: scalelite-recordings
+    restart: unless-stopped
+    volumes:
+      - ./log/recordings/:/var/log/nginx
+      - ${SCALELITE_RECORDING_DIR-/mnt/scalelite-recordings/var/bigbluebutton}/published:/var/bigbluebutton/published
+    depends_on:
+      - scalelite-api
+
   scalelite-api:
-    image: ${SCALELITE_REPO:-blindsidenetwks}/scalelite:${SCALELITE_TAG:-v1}-api
+    image: ${SCALELITE_DOCKER_IMAGE:-blindsidenetwks/scalelite:v1.0}
     container_name: scalelite-api
     restart: unless-stopped
     volumes:
@@ -105,21 +115,20 @@ services:
       driver: journald
 
   scalelite-poller:
-    image: ${SCALELITE_REPO:-blindsidenetwks}/scalelite:${SCALELITE_TAG:-v1}-poller
+    image: ${SCALELITE_DOCKER_IMAGE:-blindsidenetwks/scalelite:v1.0}
     container_name: scalelite-poller
     restart: unless-stopped
     environment:
       - REDIS_URL=${REDIS_URL:-redis://redis:6379}
       - DATABASE_URL=${DATABASE_URL:-postgres://postgres:password@postgres:5432/scalelite?pool=5}
+    command: /bin/sh -c "bin/start-poller"
     depends_on:
-      - postgres
-      - redis
       - scalelite-api
     logging:
       driver: journald
 
   scalelite-recording-importer:
-    image: ${SCALELITE_REPO:-blindsidenetwks}/scalelite:${SCALELITE_TAG:-v1}-recording-importer
+    image: ${SCALELITE_DOCKER_IMAGE:-blindsidenetwks/scalelite:v1.0}
     container_name: scalelite-recording-importer
     restart: unless-stopped
     environment:
@@ -129,6 +138,7 @@ services:
     volumes:
       - ${SCALELITE_RECORDING_DIR-/mnt/scalelite-recordings/var/bigbluebutton}:/var/bigbluebutton
       - ${SCALELITE_RECORDING_DIR-/mnt/scalelite-recordings/var/bigbluebutton}/spool:/var/bigbluebutton/spool
+    command: /bin/sh -c "bin/start-recording-importer"
     depends_on:
       - postgres
       - redis

dotenv

@@ -14,10 +14,16 @@
 # SCALELITE_NGINX_EXTRA_OPTS=--mount type=bind,source=/etc/letsencrypt,target=/etc/nginx/ssl,readonly
 # URL_HOST=
 #
-### Required when when specific repo or version (other than defaults) are needed
+### Required when when specific repo or version (other than defaults) are needed (DEPRECATED)
 # SCALELITE_REPO=blindsidenetwks
 # SCALELITE_TAG=v1
 #
+### Required when when specific repo or version (other than defaults) are needed
+SCALELITE_DOCKER_IMAGE=blindsidenetwks/scalelite:v1.0
+#
+### Required when recordings are enabled and using BigBlueButton Playback Proxy to serve the recordings.
+SCALELITE_RECORDINGS_DOCKER_IMAGE=bigbluebutton/bbb-playback-proxy:bionic-230-amazonlinux
+#
 ### Optional for postgres when using docker-compose
 # POSTGRES_USER=
 # POSTGRES_PASSWORD=
@@ -25,3 +31,21 @@
 ### Optional for init-letsencrypt.sh when using certbot for generating signed SSL certificates
 #LETSENCRYPT_EMAIL=
 #LETSENCRYPT_STAGING=0 # Set to 1 if you're testing your setup to avoid hitting request limits
+#
+### Optional since v1.0.12
+# DB_DISABLED=false
+# POLL_INTERVAL=60
+# RECORDING_DISABLED=false
+# RECORDING_IMPORT_POLL=true
+# RECORDING_IMPORT_POLL_INTERVAL=60
+# RECORDING_IMPORT_UNPUBLISHED=false
+#
+### Optional when using docker-compose-dev.yml
+# DOCKER_VOL_SCALELITE_API=~/scalelite-run/data/scalelite
+# DOCKER_VOL_POSTGRES_DATA=~/scalelite-run/data/postgres
+# DOCKER_VOL_REDIS_DATA=~/scalelite-run/data/redis
+#
+### Optional for development when using different profiles
+DOCKER_PROXY_NGINX_TEMPLATE=scalelite-proxy
+#DOCKER_PROXY_NGINX_TEMPLATE=scalelite-local
+#DOCKER_PROXY_NGINX_TEMPLATE=scalelite-cluster