Merge pull request #354 from EscolaLMS/develop

fixing disable_queue env var

Dockerfile

@@ -7,7 +7,7 @@ RUN \
   # general supervisord settings
   cp docker/conf/supervisor/supervisord.conf /etc/supervisor/supervisord.conf \
   #   supervisord services 
-  && cp -r docker/conf/supervisor/services/* /etc/supervisor/custom.d \
+  # && cp -r docker/conf/supervisor/services/* /etc/supervisor/custom.d \
   # devilbox php.ini./ TODO this should be rather send to different custom file 
   && cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini \
   # overwrite some php-fpm settings

Dockerfile.develop

@@ -4,7 +4,7 @@ COPY / /var/www/html
 RUN pecl install excimer
 RUN cp docker/conf/supervisor/supervisord.conf /etc/supervisor/supervisord.conf \
   #  supervisord services 
-  && cp -r docker/conf/supervisor/services/* /etc/supervisor/custom.d \
+  # && cp -r docker/conf/supervisor/services/* /etc/supervisor/custom.d \
   # devilbox php.ini./ TODO this should be rather send to different custom file 
   && cp docker/conf/php/xxx-devilbox-default-php.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini \
   # overwrite some php-fpm settings

init.sh

@@ -23,6 +23,7 @@ then
     rm -f /etc/supervisor/custom.d/horizon.conf
     echo horizon.conf disabled
 else 
+    cp docker/conf/supervisor/services/horizon.conf /etc/supervisor/custom.d/horizon.conf
     echo horizon.conf enabled
 fi
 
@@ -32,6 +33,7 @@ then
     rm -f /etc/supervisor/custom.d/scheduler.conf
     echo scheduler.conf disabled
 else 
+    cp docker/conf/supervisor/services/scheduler.conf /etc/supervisor/custom.d/scheduler.conf
     echo scheduler.conf enabled
 fi
 

init_multidomains.sh

@@ -13,7 +13,7 @@ fi
 
 if [ "$DISABLE_QUEUE" == 'true' ]
 then
-    rm -f /etc/supervisor/conf.d/multidomain_queue.conf
+    rm -f /etc/supervisor/custom.d/multidomain_queue.conf
     echo multidomain_queue.conf disabled
 else 
     cp docker/conf/supervisor/services/multidomain_queue.conf /etc/supervisor/custom.d/multidomain_queue.conf