Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 12, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a422dbd
refactor: Consolidate supervisord configurations and streamline Docke…
terabytesoftw Jul 12, 2025
8186f75
feat: Add supervisord configuration files for Apache, Nginx, PHP-FPM,…
terabytesoftw Jul 12, 2025
8f381cc
refactor: Enhance supervisord configuration handling with error check…
terabytesoftw Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions docker/apache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions docker/apache/supervisord/conf.d/queue.conf
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions docker/apache/supervisord/log/.gitignore
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions docker/apache/supervisord/supervisord.conf
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions docker/frankenphp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions docker/frankenphp/supervisord/log/.gitignore
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions docker/frankenphp/supervisord/supervisord.conf
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions docker/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions docker/nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions docker/nginx/supervisord/conf.d/queue.conf
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions docker/nginx/supervisord/log/.gitignore
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion ...er/apache/supervisord/conf.d/apache2.conf → docker/supervisord/conf.d/apache2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[program:apache2]
command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
autorestart=true
autostart=true
autorestart=true
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
0 ...kenphp/supervisord/conf.d/frankenphp.conf → docker/supervisord/conf.d/frankenphp.conf
View file
Open in desktop
File renamed without changes.
0 docker/nginx/supervisord/conf.d/nginx.conf → docker/supervisord/conf.d/nginx.conf
View file
Open in desktop
File renamed without changes.
0 docker/nginx/supervisord/conf.d/php-fpm.conf → docker/supervisord/conf.d/php-fpm.conf
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions .../frankenphp/supervisord/conf.d/queue.conf → docker/supervisord/conf.d/queue.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ process_name=%(program_name)s_%(process_num)02d
command=/usr/local/bin/php /app/yii queue/listen --verbose=1 --color=0
autorestart=true
autostart=true
killasgroup=true
numprocs=4
redirect_stderr=true
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stopasgroup=true
user=www-data
4 changes: 2 additions & 2 deletions docker/nginx/supervisord/supervisord.conf → docker/supervisord/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
logfile = /proc/self/fd/1
logfile_maxbytes = 0
loglevel = info
pidfile = /var/run/supervisord.pid
nodaemon = true
user = root
pidfile = /var/run/supervisord.pid
silent = true
user = root

[include]
files = /etc/supervisor/conf.d/*.conf
Expand Down
Loading