refactor: Consolidate supervisord configurations and streamline Dockerfiles for improved service management. (#116)

Author: terabytesoftw

docker/apache/Dockerfile

@@ -41,14 +41,11 @@ RUN usermod -u ${USER_ID} www-data && groupmod -g ${GROUP_ID} www-data
 RUN mkdir -p /var/www/.composer/cache /var/www/.npm && \
     chown -R www-data:www-data /var/www/.composer /var/www/.npm
 
-# Copy supervisord config
-COPY docker/apache/supervisord/supervisord.conf /etc/supervisor/supervisord.conf
-
 # Copy supervisord program configs
-COPY docker/apache/supervisord/conf.d/apache2.conf /etc/supervisor/conf.d/apache2.conf
+COPY docker/supervisord/conf.d/apache2.conf /etc/supervisor/conf.d/apache2.conf
 
 # Copy queue worker config uncommented for use with yii2-queue
-#COPY docker/apache/supervisord/conf.d/queue.conf /etc/supervisor/conf.d/queue.conf
+#COPY docker/supervisord/conf.d/queue.conf /etc/supervisor/conf.d/queue.conf
 
 # Copy scripts
 COPY docker/init.sh /usr/local/bin/init.sh

docker/apache/supervisord/conf.d/queue.conf

@@ -51,14 +51,11 @@ RUN usermod -u ${USER_ID} www-data && groupmod -g ${GROUP_ID} www-data
 RUN mkdir -p /var/www/.composer/cache /var/www/.npm && \
     chown -R www-data:www-data /var/www/.composer /var/www/.npm
 
-# Copy supervisord config
-COPY docker/frankenphp/supervisord/supervisord.conf /etc/supervisor/supervisord.conf
-
 # Copy supervisord program configs
-COPY docker/frankenphp/supervisord/conf.d/frankenphp.conf /etc/supervisor/conf.d/frankenphp.conf
+COPY docker/supervisord/conf.d/frankenphp.conf /etc/supervisor/conf.d/frankenphp.conf
 
 # Copy queue worker config uncommented for use with yii2-queue
-#COPY docker/frankenphp/supervisord/conf.d/queue.conf /etc/supervisor/conf.d/queue.conf
+#COPY docker/supervisord/conf.d/queue.conf /etc/supervisor/conf.d/queue.conf
 
 # Copy scripts
 COPY docker/init.sh /usr/local/bin/init.sh

docker/apache/supervisord/log/.gitignore

@@ -84,6 +84,17 @@ if [ -f "/app/composer.json" ] && [ ! -d "/app/vendor" ]; then
     echo -e "${GREEN}✓ Composer dependencies installed successfully${NC}"
 fi
 
+# Copy supervisord configuration
+echo -e "${YELLOW}Configuring supervisord...${NC}"
+
+if [ -f "/app/docker/supervisord/supervisord.conf" ]; then
+    cp /app/docker/supervisord/supervisord.conf /etc/supervisor/supervisord.conf
+    echo -e "${GREEN}✓ Supervisord configuration copied successfully${NC}"
+else
+    echo -e "${RED}✗ Error: Supervisord configuration file not found${NC}"
+    exit 1
+fi
+
 echo -e "${GREEN}Starting supervisord...${NC}"
 
 # Start supervisord

docker/apache/supervisord/supervisord.conf

@@ -36,15 +36,12 @@ RUN usermod -u ${USER_ID} www-data && groupmod -g ${GROUP_ID} www-data
 RUN mkdir -p /var/www/.composer/cache /var/www/.npm && \
     chown -R www-data:www-data /var/www/.composer /var/www/.npm
 
-# Copy supervisord config
-COPY docker/nginx/supervisord/supervisord.conf /etc/supervisor/supervisord.conf
-
 # Copy supervisord program configs
-COPY docker/nginx/supervisord/conf.d/nginx.conf /etc/supervisor/conf.d/nginx.conf
-COPY docker/nginx/supervisord/conf.d/php-fpm.conf /etc/supervisor/conf.d/php-fpm.conf
+COPY docker/supervisord/conf.d/nginx.conf /etc/supervisor/conf.d/nginx.conf
+COPY docker/supervisord/conf.d/php-fpm.conf /etc/supervisor/conf.d/php-fpm.conf
 
 # Copy queue worker config uncommented for use with yii2-queue
-#COPY docker/nginx/supervisord/conf.d/queue.conf /etc/supervisor/conf.d/queue.conf
+#COPY docker/supervisord/conf.d/queue.conf /etc/supervisor/conf.d/queue.conf
 
 # Copy scripts
 COPY docker/init.sh /usr/local/bin/init.sh