Adding Supervisord Header Config

dbpolito · dbpolito · commit 7bedcbed2082 · 2025-04-29T13:05:05.000-03:00
diff --git a/8.0-nginx-prod/Dockerfile b/8.0-nginx-prod/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.0-nginx-prod/supervisor.conf b/8.0-nginx-prod/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.0-nginx/Dockerfile b/8.0-nginx/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.0-nginx/supervisor.conf b/8.0-nginx/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.1-nginx-prod/Dockerfile b/8.1-nginx-prod/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.1-nginx-prod/supervisor.conf b/8.1-nginx-prod/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.1-nginx/Dockerfile b/8.1-nginx/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.1-nginx/supervisor.conf b/8.1-nginx/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.2-nginx-prod/Dockerfile b/8.2-nginx-prod/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.2-nginx-prod/supervisor.conf b/8.2-nginx-prod/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.2-nginx/Dockerfile b/8.2-nginx/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.2-nginx/supervisor.conf b/8.2-nginx/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.3-nginx-prod/Dockerfile b/8.3-nginx-prod/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.3-nginx-prod/supervisor.conf b/8.3-nginx-prod/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.3-nginx/Dockerfile b/8.3-nginx/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.3-nginx/supervisor.conf b/8.3-nginx/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.4-nginx-prod/Dockerfile b/8.4-nginx-prod/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.4-nginx-prod/supervisor.conf b/8.4-nginx-prod/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/8.4-nginx/Dockerfile b/8.4-nginx/Dockerfile
@@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/8.4-nginx/supervisor.conf b/8.4-nginx/supervisor.conf
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
diff --git a/template/Dockerfile-nginx.blade.php b/template/Dockerfile-nginx.blade.php
@@ -29,9 +29,7 @@
     NGINX_FASTCGI_BUFFER_SIZE='16k' \
     NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true
 
-RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \
-    && chmod +x /usr/local/bin/supervisord \
-    && apk add --no-cache nginx \
+RUN apk add --no-cache nginx supervisord \
     && chown -R kool:kool /var/lib/nginx \
     && chmod 770 /var/lib/nginx/tmp \
     && ln -sf /dev/stdout /var/log/nginx/access.log \
diff --git a/template/supervisor-conf.blade.php b/template/supervisor-conf.blade.php
@@ -1,3 +1,7 @@
+[supervisord]
+logfile=/dev/stdout
+nodaemon=true
+
 [program:nginx]
 depends_on = php-fpm
 command = nginx -g "daemon off;"
