From 7ca9d06a880f2a44c6bc7b793d00924e1ffc3b10 Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Wed, 28 Apr 2021 11:33:20 -0400
Subject: changed way to setup docker image

---
 docker-compose-dev.yml | 12 ++----------
 dotenv-dev             |  5 +++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 1134401..b144f7c 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -85,16 +85,6 @@ 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_DOCKER_IMAGE:-blindsidenetwks/scalelite:v1.0}
     container_name: scalelite-api
@@ -108,6 +98,7 @@ services:
       - REDIS_URL=${REDIS_URL:-redis://redis:6379}
       - DATABASE_URL=${DATABASE_URL:-postgres://postgres:password@postgres:5432/scalelite?pool=5}
       - RECORDING_DISABLED=${RECORDING_DISABLED-false}
+      - SERVER_ID_IS_HOSTNAME=${SERVER_ID_IS_HOSTNAME-false}
     depends_on:
       - postgres
       - redis
@@ -121,6 +112,7 @@ services:
     environment:
       - REDIS_URL=${REDIS_URL:-redis://redis:6379}
       - DATABASE_URL=${DATABASE_URL:-postgres://postgres:password@postgres:5432/scalelite?pool=5}
+      - SERVER_ID_IS_HOSTNAME=${SERVER_ID_IS_HOSTNAME-false}
     command: /bin/sh -c "bin/start-poller"
     depends_on:
       - scalelite-api
diff --git a/dotenv-dev b/dotenv-dev
index 8037c41..8562754 100644
--- a/dotenv-dev
+++ b/dotenv-dev
@@ -2,8 +2,8 @@ SECRET_KEY_BASE=secret
 LOADBALANCER_SECRET=secret
 URL_HOST=sl.example.com
 
-SCALELITE_REPO=blindsidenetwks
-SCALELITE_TAG=master
+SCALELITE_DOCKER_IMAGE=blindsidenetwks/master:v1.0
+SCALELITE_RECORDINGS_DOCKER_IMAGE=bigbluebutton/bbb-playback-proxy:bionic-230-amazonlinux
 
 DB_DISABLED: "false"
 POLL_INTERVAL: "60"
@@ -17,3 +17,4 @@ DOCKER_VOL_REDIS_DATA=/home/ubuntu/scalelite-run/data/redis
 
 DOCKER_PROXY_NGINX_TEMPLATE=scalelite-proxy
 #DOCKER_PROXY_NGINX_TEMPLATE=scalelite-local
+#DOCKER_PROXY_NGINX_TEMPLATE=scalelite-cluster
-- 
cgit v1.2.3