From e5370c604d411d1fd966f129445e89678d3eccc9 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Tue, 5 Dec 2023 15:24:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20PHP=20=E5=A2=9E=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=89=E8=A3=85=20supervisor=20=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/php5/5.4.45/build/php/Dockerfile | 2 - apps/php5/5.4.45/docker-compose.yml | 1 - .../5.4.45/supervisor/log/supervisord.log | 0 apps/php5/5.4.45/supervisor/run.sh | 3 - .../5.4.45/supervisor/supervisor.d/.gitkeep | 0 apps/php5/5.4.45/supervisor/supervisord.conf | 155 ------------------ apps/php5/5.5.38/build/php/Dockerfile | 3 - apps/php5/5.5.38/docker-compose.yml | 1 - .../5.5.38/supervisor/log/supervisord.log | 0 apps/php5/5.5.38/supervisor/run.sh | 3 - .../5.5.38/supervisor/supervisor.d/.gitkeep | 0 apps/php5/5.5.38/supervisor/supervisord.conf | 155 ------------------ apps/php5/5.6.40/build/php/Dockerfile | 6 +- apps/php5/5.6.40/docker-compose.yml | 1 - .../5.6.40/supervisor/log/supervisord.log | 0 apps/php5/5.6.40/supervisor/run.sh | 3 - .../5.6.40/supervisor/supervisor.d/.gitkeep | 0 apps/php5/5.6.40/supervisor/supervisord.conf | 155 ------------------ apps/php7/7.0.33/build/.env | 3 +- apps/php7/7.0.33/build/config.json | 17 ++ apps/php7/7.0.33/build/docker-compose.yml | 1 + apps/php7/7.0.33/build/php/Dockerfile | 12 +- apps/php7/7.0.33/supervisor/run.sh | 4 +- apps/php7/7.1.33/build/.env | 3 +- apps/php7/7.1.33/build/config.json | 17 ++ apps/php7/7.1.33/build/docker-compose.yml | 1 + apps/php7/7.1.33/build/php/Dockerfile | 12 +- apps/php7/7.1.33/supervisor/run.sh | 4 +- apps/php7/7.2.34/build/.env | 3 +- apps/php7/7.2.34/build/config.json | 17 ++ apps/php7/7.2.34/build/docker-compose.yml | 1 + apps/php7/7.2.34/build/php/Dockerfile | 12 +- apps/php7/7.2.34/supervisor/run.sh | 4 +- apps/php7/7.3.33/build/.env | 3 +- apps/php7/7.3.33/build/config.json | 17 ++ apps/php7/7.3.33/build/docker-compose.yml | 1 + apps/php7/7.3.33/build/php/Dockerfile | 12 +- apps/php7/7.3.33/supervisor/run.sh | 4 +- apps/php7/7.4.33/build/.env | 3 +- apps/php7/7.4.33/build/config.json | 17 ++ apps/php7/7.4.33/build/docker-compose.yml | 1 + apps/php7/7.4.33/build/php/Dockerfile | 11 +- apps/php7/7.4.33/supervisor/run.sh | 4 +- apps/php8/8.0.30/build/.env | 3 +- apps/php8/8.0.30/build/config.json | 17 ++ apps/php8/8.0.30/build/docker-compose.yml | 1 + apps/php8/8.0.30/build/php/Dockerfile | 6 +- apps/php8/8.0.30/supervisor/run.sh | 4 +- apps/php8/8.1.23/build/.env | 3 +- apps/php8/8.1.23/build/config.json | 23 ++- apps/php8/8.1.23/build/docker-compose.yml | 1 + apps/php8/8.1.23/build/php/Dockerfile | 6 +- apps/php8/8.1.23/supervisor/run.sh | 4 +- apps/php8/8.2.10/build/.env | 3 +- apps/php8/8.2.10/build/config.json | 17 ++ apps/php8/8.2.10/build/docker-compose.yml | 1 + apps/php8/8.2.10/build/php/Dockerfile | 7 +- apps/php8/8.2.10/supervisor/run.sh | 4 +- 58 files changed, 227 insertions(+), 545 deletions(-) delete mode 100644 apps/php5/5.4.45/supervisor/log/supervisord.log delete mode 100644 apps/php5/5.4.45/supervisor/run.sh delete mode 100644 apps/php5/5.4.45/supervisor/supervisor.d/.gitkeep delete mode 100644 apps/php5/5.4.45/supervisor/supervisord.conf delete mode 100644 apps/php5/5.5.38/supervisor/log/supervisord.log delete mode 100644 apps/php5/5.5.38/supervisor/run.sh delete mode 100644 apps/php5/5.5.38/supervisor/supervisor.d/.gitkeep delete mode 100644 apps/php5/5.5.38/supervisor/supervisord.conf delete mode 100644 apps/php5/5.6.40/supervisor/log/supervisord.log delete mode 100644 apps/php5/5.6.40/supervisor/run.sh delete mode 100644 apps/php5/5.6.40/supervisor/supervisor.d/.gitkeep delete mode 100644 apps/php5/5.6.40/supervisor/supervisord.conf diff --git a/apps/php5/5.4.45/build/php/Dockerfile b/apps/php5/5.4.45/build/php/Dockerfile index 52f4ae29..3b8618d1 100644 --- a/apps/php5/5.4.45/build/php/Dockerfile +++ b/apps/php5/5.4.45/build/php/Dockerfile @@ -17,8 +17,6 @@ RUN curl -o /usr/bin/composer https://mirrors.aliyun.com/composer/composer.phar && chmod +x /usr/bin/composer ENV COMPOSER_HOME=/tmp/composer -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN usermod -u 1000 www-data && groupmod -g 1000 www-data diff --git a/apps/php5/5.4.45/docker-compose.yml b/apps/php5/5.4.45/docker-compose.yml index a854f960..308932f8 100644 --- a/apps/php5/5.4.45/docker-compose.yml +++ b/apps/php5/5.4.45/docker-compose.yml @@ -17,7 +17,6 @@ services: - ./supervisor/supervisor.d:/etc/supervisor.d - ./supervisor/log/supervisord.log:/var/log/supervisord.log - ./supervisor/run.sh:/run.sh - command: sh /run.sh ports: - 127.0.0.1:${PANEL_APP_PORT_HTTP}:9000 labels: diff --git a/apps/php5/5.4.45/supervisor/log/supervisord.log b/apps/php5/5.4.45/supervisor/log/supervisord.log deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/php5/5.4.45/supervisor/run.sh b/apps/php5/5.4.45/supervisor/run.sh deleted file mode 100644 index 1af74853..00000000 --- a/apps/php5/5.4.45/supervisor/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -supervisord -c /etc/supervisord.conf \ No newline at end of file diff --git a/apps/php5/5.4.45/supervisor/supervisor.d/.gitkeep b/apps/php5/5.4.45/supervisor/supervisor.d/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/php5/5.4.45/supervisor/supervisord.conf b/apps/php5/5.4.45/supervisor/supervisord.conf deleted file mode 100644 index c966c994..00000000 --- a/apps/php5/5.4.45/supervisor/supervisord.conf +++ /dev/null @@ -1,155 +0,0 @@ -; Sample supervisor config file. -; -; For more information on the config file, please see: -; http://supervisord.org/configuration.html -; -; Notes: -; - Shell expansion ("~" or "$HOME") is not supported. Environment -; variables can be expanded using this syntax: "%(ENV_HOME)s". -; - Quotes around values are not supported, except in the case of -; the environment= options as shown below. -; - Comments must have a leading space: "a=b ;comment" not "a=b;comment". -; - Command will be truncated if it looks like a config file comment, e.g. -; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ". -[unix_http_server] -; the path to the socket file -file = /run/supervisor.sock - -; chmod=0700 ; socket file mode (default 0700) -; chown=nobody:nogroup ; socket file uid:gid owner -; username=user ; default is no username (open server) -; password=123 ; default is no password (open server) -; inet (TCP) server disabled by default -[inet_http_server] -; ip_address:port specifier, *:port for all iface -port = 127.0.0.1:9002 - -; username=user ; default is no username (open server) -; password=123 ; default is no password (open server) -[supervisord] -; main log file; default $CWD/supervisord.log -logfile = /var/log/supervisord.log -; max main logfile bytes b4 rotation; default 50MB -logfile_maxbytes = 50MB -; # of main logfile backups; 0 means none, default 11 -logfile_backups = 10 -; log level; default info; others: debug,warn,trace -loglevel = info -; supervisord pidfile; default supervisord.pid -pidfile = /run/supervisord.pid -; start in foreground if true; default false -nodaemon = true -; min. avail startup file descriptors; default 1024 -minfds = 1024 -; min. avail process descriptors;default 200 -minprocs = 200 -; umask=022 ; process file creation umask; default 022 -; user=supervisord ; setuid to this UNIX account at startup; recommended if root -; identifier=supervisor ; supervisord identifier, default is 'supervisor' -; directory=/tmp ; default is not to cd during start -; nocleanup=true ; don't clean up tempfiles at start; default false -; 'AUTO' child log dir, default $TEMP -childlogdir = /var/log/supervisor - -; environment=KEY="value" ; key value pairs to add to environment -; strip_ansi=false ; strip ansi escape codes in logs; def. false -; The rpcinterface:supervisor section must remain in the config file for -; RPC (supervisorctl/web interface) to work. Additional interfaces may be -; added by defining them in separate [rpcinterface:x] sections. -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -; The supervisorctl section configures how supervisorctl will connect to -; supervisord. configure it match the settings in either the unix_http_server -; or inet_http_server section. -[supervisorctl] -; use a unix:// URL for a unix socket -serverurl = unix:///run/supervisor.sock - -; serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket -; username=chris ; should be same as in [*_http_server] if set -; password=123 ; should be same as in [*_http_server] if set -; prompt=mysupervisor ; cmd line prompt (default "supervisor") -; history_file=~/.sc_history ; use readline history if available -; The sample program section below shows all possible program subsection values. -; Create one or more 'real' program: sections to be able to control them under -; supervisor. -; [program:theprogramname] -; command=/bin/cat ; the program (relative uses PATH, can take args) -; process_name=%(program_name)s ; process_name expr (default %(program_name)s) -; numprocs=1 ; number of processes copies to start (def 1) -; directory=/tmp ; directory to cwd to before exec (def no cwd) -; umask=022 ; umask for process (default None) -; priority=999 ; the relative start priority (default 999) -; autostart=true ; start at supervisord start (default: true) -; startsecs=1 ; # of secs prog must stay up to be running (def. 1) -; startretries=3 ; max # of serial start failures when starting (default 3) -; autorestart=unexpected ; when to restart if exited after running (def: unexpected) -; exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) -; stopsignal=QUIT ; signal used to kill process (default TERM) -; stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) -; stopasgroup=false ; send stop signal to the UNIX process group (default false) -; killasgroup=false ; SIGKILL the UNIX process group (def false) -; user=chrism ; setuid to this UNIX account to run the program -; redirect_stderr=true ; redirect proc stderr to stdout (default false) -; stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO -; stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) -; stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) -; stdout_events_enabled=false ; emit events on stdout writes (default false) -; stdout_syslog=false ; send stdout to syslog with process name (default false) -; stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO -; stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) -; stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) -; stderr_events_enabled=false ; emit events on stderr writes (default false) -; stderr_syslog=false ; send stderr to syslog with process name (default false) -; environment=A="1",B="2" ; process environment additions (def no adds) -; serverurl=AUTO ; override serverurl computation (childutils) -; The sample eventlistener section below shows all possible eventlistener -; subsection values. Create one or more 'real' eventlistener: sections to be -; able to handle event notifications sent by supervisord. -; [eventlistener:theeventlistenername] -; command=/bin/eventlistener ; the program (relative uses PATH, can take args) -; process_name=%(program_name)s ; process_name expr (default %(program_name)s) -; numprocs=1 ; number of processes copies to start (def 1) -; events=EVENT ; event notif. types to subscribe to (req'd) -; buffer_size=10 ; event buffer queue size (default 10) -; directory=/tmp ; directory to cwd to before exec (def no cwd) -; umask=022 ; umask for process (default None) -; priority=-1 ; the relative start priority (default -1) -; autostart=true ; start at supervisord start (default: true) -; startsecs=1 ; # of secs prog must stay up to be running (def. 1) -; startretries=3 ; max # of serial start failures when starting (default 3) -; autorestart=unexpected ; autorestart if exited after running (def: unexpected) -; exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) -; stopsignal=QUIT ; signal used to kill process (default TERM) -; stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) -; stopasgroup=false ; send stop signal to the UNIX process group (default false) -; killasgroup=false ; SIGKILL the UNIX process group (def false) -; user=chrism ; setuid to this UNIX account to run the program -; redirect_stderr=false ; redirect_stderr=true is not allowed for eventlisteners -; stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO -; stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) -; stdout_events_enabled=false ; emit events on stdout writes (default false) -; stdout_syslog=false ; send stdout to syslog with process name (default false) -; stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO -; stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) -; stderr_events_enabled=false ; emit events on stderr writes (default false) -; stderr_syslog=false ; send stderr to syslog with process name (default false) -; environment=A="1",B="2" ; process environment additions -; serverurl=AUTO ; override serverurl computation (childutils) -; The sample group section below shows all possible group values. Create one -; or more 'real' group: sections to create "heterogeneous" process groups. -; [group:thegroupname] -; programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions -; priority=999 ; the relative start priority (default 999) -; The [include] section can just contain the "files" setting. This -; setting can list multiple files (separated by whitespace or -; newlines). It can also contain wildcards. The filenames are -; interpreted as relative to this file. Included files *cannot* -; include files themselves. -[include] -files = /etc/supervisor.d/*.ini diff --git a/apps/php5/5.5.38/build/php/Dockerfile b/apps/php5/5.5.38/build/php/Dockerfile index e541d11c..5f52897a 100644 --- a/apps/php5/5.5.38/build/php/Dockerfile +++ b/apps/php5/5.5.38/build/php/Dockerfile @@ -16,9 +16,6 @@ WORKDIR /tmp/extensions RUN chmod +x install.sh \ && sh install.sh -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone diff --git a/apps/php5/5.5.38/docker-compose.yml b/apps/php5/5.5.38/docker-compose.yml index a854f960..308932f8 100644 --- a/apps/php5/5.5.38/docker-compose.yml +++ b/apps/php5/5.5.38/docker-compose.yml @@ -17,7 +17,6 @@ services: - ./supervisor/supervisor.d:/etc/supervisor.d - ./supervisor/log/supervisord.log:/var/log/supervisord.log - ./supervisor/run.sh:/run.sh - command: sh /run.sh ports: - 127.0.0.1:${PANEL_APP_PORT_HTTP}:9000 labels: diff --git a/apps/php5/5.5.38/supervisor/log/supervisord.log b/apps/php5/5.5.38/supervisor/log/supervisord.log deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/php5/5.5.38/supervisor/run.sh b/apps/php5/5.5.38/supervisor/run.sh deleted file mode 100644 index 1af74853..00000000 --- a/apps/php5/5.5.38/supervisor/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -supervisord -c /etc/supervisord.conf \ No newline at end of file diff --git a/apps/php5/5.5.38/supervisor/supervisor.d/.gitkeep b/apps/php5/5.5.38/supervisor/supervisor.d/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/php5/5.5.38/supervisor/supervisord.conf b/apps/php5/5.5.38/supervisor/supervisord.conf deleted file mode 100644 index c966c994..00000000 --- a/apps/php5/5.5.38/supervisor/supervisord.conf +++ /dev/null @@ -1,155 +0,0 @@ -; Sample supervisor config file. -; -; For more information on the config file, please see: -; http://supervisord.org/configuration.html -; -; Notes: -; - Shell expansion ("~" or "$HOME") is not supported. Environment -; variables can be expanded using this syntax: "%(ENV_HOME)s". -; - Quotes around values are not supported, except in the case of -; the environment= options as shown below. -; - Comments must have a leading space: "a=b ;comment" not "a=b;comment". -; - Command will be truncated if it looks like a config file comment, e.g. -; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ". -[unix_http_server] -; the path to the socket file -file = /run/supervisor.sock - -; chmod=0700 ; socket file mode (default 0700) -; chown=nobody:nogroup ; socket file uid:gid owner -; username=user ; default is no username (open server) -; password=123 ; default is no password (open server) -; inet (TCP) server disabled by default -[inet_http_server] -; ip_address:port specifier, *:port for all iface -port = 127.0.0.1:9002 - -; username=user ; default is no username (open server) -; password=123 ; default is no password (open server) -[supervisord] -; main log file; default $CWD/supervisord.log -logfile = /var/log/supervisord.log -; max main logfile bytes b4 rotation; default 50MB -logfile_maxbytes = 50MB -; # of main logfile backups; 0 means none, default 11 -logfile_backups = 10 -; log level; default info; others: debug,warn,trace -loglevel = info -; supervisord pidfile; default supervisord.pid -pidfile = /run/supervisord.pid -; start in foreground if true; default false -nodaemon = true -; min. avail startup file descriptors; default 1024 -minfds = 1024 -; min. avail process descriptors;default 200 -minprocs = 200 -; umask=022 ; process file creation umask; default 022 -; user=supervisord ; setuid to this UNIX account at startup; recommended if root -; identifier=supervisor ; supervisord identifier, default is 'supervisor' -; directory=/tmp ; default is not to cd during start -; nocleanup=true ; don't clean up tempfiles at start; default false -; 'AUTO' child log dir, default $TEMP -childlogdir = /var/log/supervisor - -; environment=KEY="value" ; key value pairs to add to environment -; strip_ansi=false ; strip ansi escape codes in logs; def. false -; The rpcinterface:supervisor section must remain in the config file for -; RPC (supervisorctl/web interface) to work. Additional interfaces may be -; added by defining them in separate [rpcinterface:x] sections. -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -; The supervisorctl section configures how supervisorctl will connect to -; supervisord. configure it match the settings in either the unix_http_server -; or inet_http_server section. -[supervisorctl] -; use a unix:// URL for a unix socket -serverurl = unix:///run/supervisor.sock - -; serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket -; username=chris ; should be same as in [*_http_server] if set -; password=123 ; should be same as in [*_http_server] if set -; prompt=mysupervisor ; cmd line prompt (default "supervisor") -; history_file=~/.sc_history ; use readline history if available -; The sample program section below shows all possible program subsection values. -; Create one or more 'real' program: sections to be able to control them under -; supervisor. -; [program:theprogramname] -; command=/bin/cat ; the program (relative uses PATH, can take args) -; process_name=%(program_name)s ; process_name expr (default %(program_name)s) -; numprocs=1 ; number of processes copies to start (def 1) -; directory=/tmp ; directory to cwd to before exec (def no cwd) -; umask=022 ; umask for process (default None) -; priority=999 ; the relative start priority (default 999) -; autostart=true ; start at supervisord start (default: true) -; startsecs=1 ; # of secs prog must stay up to be running (def. 1) -; startretries=3 ; max # of serial start failures when starting (default 3) -; autorestart=unexpected ; when to restart if exited after running (def: unexpected) -; exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) -; stopsignal=QUIT ; signal used to kill process (default TERM) -; stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) -; stopasgroup=false ; send stop signal to the UNIX process group (default false) -; killasgroup=false ; SIGKILL the UNIX process group (def false) -; user=chrism ; setuid to this UNIX account to run the program -; redirect_stderr=true ; redirect proc stderr to stdout (default false) -; stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO -; stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) -; stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) -; stdout_events_enabled=false ; emit events on stdout writes (default false) -; stdout_syslog=false ; send stdout to syslog with process name (default false) -; stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO -; stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) -; stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) -; stderr_events_enabled=false ; emit events on stderr writes (default false) -; stderr_syslog=false ; send stderr to syslog with process name (default false) -; environment=A="1",B="2" ; process environment additions (def no adds) -; serverurl=AUTO ; override serverurl computation (childutils) -; The sample eventlistener section below shows all possible eventlistener -; subsection values. Create one or more 'real' eventlistener: sections to be -; able to handle event notifications sent by supervisord. -; [eventlistener:theeventlistenername] -; command=/bin/eventlistener ; the program (relative uses PATH, can take args) -; process_name=%(program_name)s ; process_name expr (default %(program_name)s) -; numprocs=1 ; number of processes copies to start (def 1) -; events=EVENT ; event notif. types to subscribe to (req'd) -; buffer_size=10 ; event buffer queue size (default 10) -; directory=/tmp ; directory to cwd to before exec (def no cwd) -; umask=022 ; umask for process (default None) -; priority=-1 ; the relative start priority (default -1) -; autostart=true ; start at supervisord start (default: true) -; startsecs=1 ; # of secs prog must stay up to be running (def. 1) -; startretries=3 ; max # of serial start failures when starting (default 3) -; autorestart=unexpected ; autorestart if exited after running (def: unexpected) -; exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) -; stopsignal=QUIT ; signal used to kill process (default TERM) -; stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) -; stopasgroup=false ; send stop signal to the UNIX process group (default false) -; killasgroup=false ; SIGKILL the UNIX process group (def false) -; user=chrism ; setuid to this UNIX account to run the program -; redirect_stderr=false ; redirect_stderr=true is not allowed for eventlisteners -; stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO -; stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) -; stdout_events_enabled=false ; emit events on stdout writes (default false) -; stdout_syslog=false ; send stdout to syslog with process name (default false) -; stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO -; stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) -; stderr_events_enabled=false ; emit events on stderr writes (default false) -; stderr_syslog=false ; send stderr to syslog with process name (default false) -; environment=A="1",B="2" ; process environment additions -; serverurl=AUTO ; override serverurl computation (childutils) -; The sample group section below shows all possible group values. Create one -; or more 'real' group: sections to create "heterogeneous" process groups. -; [group:thegroupname] -; programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions -; priority=999 ; the relative start priority (default 999) -; The [include] section can just contain the "files" setting. This -; setting can list multiple files (separated by whitespace or -; newlines). It can also contain wildcards. The filenames are -; interpreted as relative to this file. Included files *cannot* -; include files themselves. -[include] -files = /etc/supervisor.d/*.ini diff --git a/apps/php5/5.6.40/build/php/Dockerfile b/apps/php5/5.6.40/build/php/Dockerfile index 97ca458c..ba8fcdf8 100644 --- a/apps/php5/5.6.40/build/php/Dockerfile +++ b/apps/php5/5.6.40/build/php/Dockerfile @@ -5,7 +5,7 @@ ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL -RUN if [ "$CONTAINER_PACKAGE_URL" ]; then sed -i "s|http://dl-cdn.alpinelinux.org/alpine/v3.4|https://${CONTAINER_PACKAGE_URL}/alpine/v3.12|g" /etc/apk/repositories; fi +RUN if [ "$CONTAINER_PACKAGE_URL" ]; then sed -i "s|http://dl-cdn.alpinelinux.org/alpine/v3.8|https://${CONTAINER_PACKAGE_URL}/alpine/v3.12|g" /etc/apk/repositories; fi ADD ./extensions/install-php-extensions /usr/local/bin/ @@ -21,10 +21,6 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - - # Fix: https://github.com/docker-library/php/issues/1121 RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php diff --git a/apps/php5/5.6.40/docker-compose.yml b/apps/php5/5.6.40/docker-compose.yml index a854f960..308932f8 100644 --- a/apps/php5/5.6.40/docker-compose.yml +++ b/apps/php5/5.6.40/docker-compose.yml @@ -17,7 +17,6 @@ services: - ./supervisor/supervisor.d:/etc/supervisor.d - ./supervisor/log/supervisord.log:/var/log/supervisord.log - ./supervisor/run.sh:/run.sh - command: sh /run.sh ports: - 127.0.0.1:${PANEL_APP_PORT_HTTP}:9000 labels: diff --git a/apps/php5/5.6.40/supervisor/log/supervisord.log b/apps/php5/5.6.40/supervisor/log/supervisord.log deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/php5/5.6.40/supervisor/run.sh b/apps/php5/5.6.40/supervisor/run.sh deleted file mode 100644 index 1af74853..00000000 --- a/apps/php5/5.6.40/supervisor/run.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -supervisord -c /etc/supervisord.conf \ No newline at end of file diff --git a/apps/php5/5.6.40/supervisor/supervisor.d/.gitkeep b/apps/php5/5.6.40/supervisor/supervisor.d/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/php5/5.6.40/supervisor/supervisord.conf b/apps/php5/5.6.40/supervisor/supervisord.conf deleted file mode 100644 index c966c994..00000000 --- a/apps/php5/5.6.40/supervisor/supervisord.conf +++ /dev/null @@ -1,155 +0,0 @@ -; Sample supervisor config file. -; -; For more information on the config file, please see: -; http://supervisord.org/configuration.html -; -; Notes: -; - Shell expansion ("~" or "$HOME") is not supported. Environment -; variables can be expanded using this syntax: "%(ENV_HOME)s". -; - Quotes around values are not supported, except in the case of -; the environment= options as shown below. -; - Comments must have a leading space: "a=b ;comment" not "a=b;comment". -; - Command will be truncated if it looks like a config file comment, e.g. -; "command=bash -c 'foo ; bar'" will truncate to "command=bash -c 'foo ". -[unix_http_server] -; the path to the socket file -file = /run/supervisor.sock - -; chmod=0700 ; socket file mode (default 0700) -; chown=nobody:nogroup ; socket file uid:gid owner -; username=user ; default is no username (open server) -; password=123 ; default is no password (open server) -; inet (TCP) server disabled by default -[inet_http_server] -; ip_address:port specifier, *:port for all iface -port = 127.0.0.1:9002 - -; username=user ; default is no username (open server) -; password=123 ; default is no password (open server) -[supervisord] -; main log file; default $CWD/supervisord.log -logfile = /var/log/supervisord.log -; max main logfile bytes b4 rotation; default 50MB -logfile_maxbytes = 50MB -; # of main logfile backups; 0 means none, default 11 -logfile_backups = 10 -; log level; default info; others: debug,warn,trace -loglevel = info -; supervisord pidfile; default supervisord.pid -pidfile = /run/supervisord.pid -; start in foreground if true; default false -nodaemon = true -; min. avail startup file descriptors; default 1024 -minfds = 1024 -; min. avail process descriptors;default 200 -minprocs = 200 -; umask=022 ; process file creation umask; default 022 -; user=supervisord ; setuid to this UNIX account at startup; recommended if root -; identifier=supervisor ; supervisord identifier, default is 'supervisor' -; directory=/tmp ; default is not to cd during start -; nocleanup=true ; don't clean up tempfiles at start; default false -; 'AUTO' child log dir, default $TEMP -childlogdir = /var/log/supervisor - -; environment=KEY="value" ; key value pairs to add to environment -; strip_ansi=false ; strip ansi escape codes in logs; def. false -; The rpcinterface:supervisor section must remain in the config file for -; RPC (supervisorctl/web interface) to work. Additional interfaces may be -; added by defining them in separate [rpcinterface:x] sections. -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -; The supervisorctl section configures how supervisorctl will connect to -; supervisord. configure it match the settings in either the unix_http_server -; or inet_http_server section. -[supervisorctl] -; use a unix:// URL for a unix socket -serverurl = unix:///run/supervisor.sock - -; serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket -; username=chris ; should be same as in [*_http_server] if set -; password=123 ; should be same as in [*_http_server] if set -; prompt=mysupervisor ; cmd line prompt (default "supervisor") -; history_file=~/.sc_history ; use readline history if available -; The sample program section below shows all possible program subsection values. -; Create one or more 'real' program: sections to be able to control them under -; supervisor. -; [program:theprogramname] -; command=/bin/cat ; the program (relative uses PATH, can take args) -; process_name=%(program_name)s ; process_name expr (default %(program_name)s) -; numprocs=1 ; number of processes copies to start (def 1) -; directory=/tmp ; directory to cwd to before exec (def no cwd) -; umask=022 ; umask for process (default None) -; priority=999 ; the relative start priority (default 999) -; autostart=true ; start at supervisord start (default: true) -; startsecs=1 ; # of secs prog must stay up to be running (def. 1) -; startretries=3 ; max # of serial start failures when starting (default 3) -; autorestart=unexpected ; when to restart if exited after running (def: unexpected) -; exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) -; stopsignal=QUIT ; signal used to kill process (default TERM) -; stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) -; stopasgroup=false ; send stop signal to the UNIX process group (default false) -; killasgroup=false ; SIGKILL the UNIX process group (def false) -; user=chrism ; setuid to this UNIX account to run the program -; redirect_stderr=true ; redirect proc stderr to stdout (default false) -; stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO -; stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) -; stdout_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) -; stdout_events_enabled=false ; emit events on stdout writes (default false) -; stdout_syslog=false ; send stdout to syslog with process name (default false) -; stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO -; stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) -; stderr_capture_maxbytes=1MB ; number of bytes in 'capturemode' (default 0) -; stderr_events_enabled=false ; emit events on stderr writes (default false) -; stderr_syslog=false ; send stderr to syslog with process name (default false) -; environment=A="1",B="2" ; process environment additions (def no adds) -; serverurl=AUTO ; override serverurl computation (childutils) -; The sample eventlistener section below shows all possible eventlistener -; subsection values. Create one or more 'real' eventlistener: sections to be -; able to handle event notifications sent by supervisord. -; [eventlistener:theeventlistenername] -; command=/bin/eventlistener ; the program (relative uses PATH, can take args) -; process_name=%(program_name)s ; process_name expr (default %(program_name)s) -; numprocs=1 ; number of processes copies to start (def 1) -; events=EVENT ; event notif. types to subscribe to (req'd) -; buffer_size=10 ; event buffer queue size (default 10) -; directory=/tmp ; directory to cwd to before exec (def no cwd) -; umask=022 ; umask for process (default None) -; priority=-1 ; the relative start priority (default -1) -; autostart=true ; start at supervisord start (default: true) -; startsecs=1 ; # of secs prog must stay up to be running (def. 1) -; startretries=3 ; max # of serial start failures when starting (default 3) -; autorestart=unexpected ; autorestart if exited after running (def: unexpected) -; exitcodes=0 ; 'expected' exit codes used with autorestart (default 0) -; stopsignal=QUIT ; signal used to kill process (default TERM) -; stopwaitsecs=10 ; max num secs to wait b4 SIGKILL (default 10) -; stopasgroup=false ; send stop signal to the UNIX process group (default false) -; killasgroup=false ; SIGKILL the UNIX process group (def false) -; user=chrism ; setuid to this UNIX account to run the program -; redirect_stderr=false ; redirect_stderr=true is not allowed for eventlisteners -; stdout_logfile=/a/path ; stdout log path, NONE for none; default AUTO -; stdout_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10) -; stdout_events_enabled=false ; emit events on stdout writes (default false) -; stdout_syslog=false ; send stdout to syslog with process name (default false) -; stderr_logfile=/a/path ; stderr log path, NONE for none; default AUTO -; stderr_logfile_maxbytes=1MB ; max # logfile bytes b4 rotation (default 50MB) -; stderr_logfile_backups=10 ; # of stderr logfile backups (0 means none, default 10) -; stderr_events_enabled=false ; emit events on stderr writes (default false) -; stderr_syslog=false ; send stderr to syslog with process name (default false) -; environment=A="1",B="2" ; process environment additions -; serverurl=AUTO ; override serverurl computation (childutils) -; The sample group section below shows all possible group values. Create one -; or more 'real' group: sections to create "heterogeneous" process groups. -; [group:thegroupname] -; programs=progname1,progname2 ; each refers to 'x' in [program:x] definitions -; priority=999 ; the relative start priority (default 999) -; The [include] section can just contain the "files" setting. This -; setting can list multiple files (separated by whitespace or -; newlines). It can also contain wildcards. The filenames are -; interpreted as relative to this file. Included files *cannot* -; include files themselves. -[include] -files = /etc/supervisor.d/*.ini diff --git a/apps/php7/7.0.33/build/.env b/apps/php7/7.0.33/build/.env index 6d9cfba8..fcdd0f44 100644 --- a/apps/php7/7.0.33/build/.env +++ b/apps/php7/7.0.33/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:7.0.33 \ No newline at end of file +IMAGE_NAME=1panel-php:7.0.33 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php7/7.0.33/build/config.json b/apps/php7/7.0.33/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php7/7.0.33/build/config.json +++ b/apps/php7/7.0.33/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php7/7.0.33/build/docker-compose.yml b/apps/php7/7.0.33/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php7/7.0.33/build/docker-compose.yml +++ b/apps/php7/7.0.33/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php7/7.0.33/build/php/Dockerfile b/apps/php7/7.0.33/build/php/Dockerfile index 3a139279..ff9b20a6 100644 --- a/apps/php7/7.0.33/build/php/Dockerfile +++ b/apps/php7/7.0.33/build/php/Dockerfile @@ -4,11 +4,10 @@ FROM ${PHP_IMAGE} ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL - +ARG INSTALL_SUPERVISOR RUN if [ $CONTAINER_PACKAGE_URL ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi - ADD ./extensions/install-php-extensions /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-php-extensions @@ -21,15 +20,15 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/1121 RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php - # Install composer and change it's cache home RUN chmod +x install-composer.sh \ && sh install-composer.sh \ @@ -39,5 +38,4 @@ ENV COMPOSER_HOME=/tmp/composer # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN apk --no-cache add shadow && usermod -u 1000 www-data && groupmod -g 1000 www-data - WORKDIR /www diff --git a/apps/php7/7.0.33/supervisor/run.sh b/apps/php7/7.0.33/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php7/7.0.33/supervisor/run.sh +++ b/apps/php7/7.0.33/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php7/7.1.33/build/.env b/apps/php7/7.1.33/build/.env index 9c02e598..876ff24f 100644 --- a/apps/php7/7.1.33/build/.env +++ b/apps/php7/7.1.33/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:7.1.33 \ No newline at end of file +IMAGE_NAME=1panel-php:7.1.33 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php7/7.1.33/build/config.json b/apps/php7/7.1.33/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php7/7.1.33/build/config.json +++ b/apps/php7/7.1.33/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php7/7.1.33/build/docker-compose.yml b/apps/php7/7.1.33/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php7/7.1.33/build/docker-compose.yml +++ b/apps/php7/7.1.33/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php7/7.1.33/build/php/Dockerfile b/apps/php7/7.1.33/build/php/Dockerfile index 3a139279..ff9b20a6 100644 --- a/apps/php7/7.1.33/build/php/Dockerfile +++ b/apps/php7/7.1.33/build/php/Dockerfile @@ -4,11 +4,10 @@ FROM ${PHP_IMAGE} ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL - +ARG INSTALL_SUPERVISOR RUN if [ $CONTAINER_PACKAGE_URL ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi - ADD ./extensions/install-php-extensions /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-php-extensions @@ -21,15 +20,15 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/1121 RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php - # Install composer and change it's cache home RUN chmod +x install-composer.sh \ && sh install-composer.sh \ @@ -39,5 +38,4 @@ ENV COMPOSER_HOME=/tmp/composer # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN apk --no-cache add shadow && usermod -u 1000 www-data && groupmod -g 1000 www-data - WORKDIR /www diff --git a/apps/php7/7.1.33/supervisor/run.sh b/apps/php7/7.1.33/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php7/7.1.33/supervisor/run.sh +++ b/apps/php7/7.1.33/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php7/7.2.34/build/.env b/apps/php7/7.2.34/build/.env index 8dc1eb59..6e53ecc0 100644 --- a/apps/php7/7.2.34/build/.env +++ b/apps/php7/7.2.34/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:7.2.34 \ No newline at end of file +IMAGE_NAME=1panel-php:7.2.34 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php7/7.2.34/build/config.json b/apps/php7/7.2.34/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php7/7.2.34/build/config.json +++ b/apps/php7/7.2.34/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php7/7.2.34/build/docker-compose.yml b/apps/php7/7.2.34/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php7/7.2.34/build/docker-compose.yml +++ b/apps/php7/7.2.34/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php7/7.2.34/build/php/Dockerfile b/apps/php7/7.2.34/build/php/Dockerfile index 3a139279..ff9b20a6 100644 --- a/apps/php7/7.2.34/build/php/Dockerfile +++ b/apps/php7/7.2.34/build/php/Dockerfile @@ -4,11 +4,10 @@ FROM ${PHP_IMAGE} ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL - +ARG INSTALL_SUPERVISOR RUN if [ $CONTAINER_PACKAGE_URL ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi - ADD ./extensions/install-php-extensions /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-php-extensions @@ -21,15 +20,15 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/1121 RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php - # Install composer and change it's cache home RUN chmod +x install-composer.sh \ && sh install-composer.sh \ @@ -39,5 +38,4 @@ ENV COMPOSER_HOME=/tmp/composer # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN apk --no-cache add shadow && usermod -u 1000 www-data && groupmod -g 1000 www-data - WORKDIR /www diff --git a/apps/php7/7.2.34/supervisor/run.sh b/apps/php7/7.2.34/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php7/7.2.34/supervisor/run.sh +++ b/apps/php7/7.2.34/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php7/7.3.33/build/.env b/apps/php7/7.3.33/build/.env index b8a74357..6b9ce91d 100644 --- a/apps/php7/7.3.33/build/.env +++ b/apps/php7/7.3.33/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:7.3.33 \ No newline at end of file +IMAGE_NAME=1panel-php:7.3.33 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php7/7.3.33/build/config.json b/apps/php7/7.3.33/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php7/7.3.33/build/config.json +++ b/apps/php7/7.3.33/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php7/7.3.33/build/docker-compose.yml b/apps/php7/7.3.33/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php7/7.3.33/build/docker-compose.yml +++ b/apps/php7/7.3.33/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php7/7.3.33/build/php/Dockerfile b/apps/php7/7.3.33/build/php/Dockerfile index 3a139279..ff9b20a6 100644 --- a/apps/php7/7.3.33/build/php/Dockerfile +++ b/apps/php7/7.3.33/build/php/Dockerfile @@ -4,11 +4,10 @@ FROM ${PHP_IMAGE} ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL - +ARG INSTALL_SUPERVISOR RUN if [ $CONTAINER_PACKAGE_URL ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi - ADD ./extensions/install-php-extensions /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-php-extensions @@ -21,15 +20,15 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/1121 RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php - # Install composer and change it's cache home RUN chmod +x install-composer.sh \ && sh install-composer.sh \ @@ -39,5 +38,4 @@ ENV COMPOSER_HOME=/tmp/composer # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN apk --no-cache add shadow && usermod -u 1000 www-data && groupmod -g 1000 www-data - WORKDIR /www diff --git a/apps/php7/7.3.33/supervisor/run.sh b/apps/php7/7.3.33/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php7/7.3.33/supervisor/run.sh +++ b/apps/php7/7.3.33/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php7/7.4.33/build/.env b/apps/php7/7.4.33/build/.env index 7ddbcdca..feb4f942 100644 --- a/apps/php7/7.4.33/build/.env +++ b/apps/php7/7.4.33/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:7.4.33 \ No newline at end of file +IMAGE_NAME=1panel-php:7.4.33 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php7/7.4.33/build/config.json b/apps/php7/7.4.33/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php7/7.4.33/build/config.json +++ b/apps/php7/7.4.33/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php7/7.4.33/build/docker-compose.yml b/apps/php7/7.4.33/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php7/7.4.33/build/docker-compose.yml +++ b/apps/php7/7.4.33/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php7/7.4.33/build/php/Dockerfile b/apps/php7/7.4.33/build/php/Dockerfile index 90b7dfaf..ff9b20a6 100644 --- a/apps/php7/7.4.33/build/php/Dockerfile +++ b/apps/php7/7.4.33/build/php/Dockerfile @@ -4,11 +4,10 @@ FROM ${PHP_IMAGE} ARG TZ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL - +ARG INSTALL_SUPERVISOR RUN if [ $CONTAINER_PACKAGE_URL ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi - ADD ./extensions/install-php-extensions /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-php-extensions @@ -21,14 +20,15 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/1121 RUN apk add --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/v3.13/community/ gnu-libiconv=1.15-r3 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php - # Install composer and change it's cache home RUN chmod +x install-composer.sh \ && sh install-composer.sh \ @@ -38,5 +38,4 @@ ENV COMPOSER_HOME=/tmp/composer # php image's www-data user uid & gid are 82, change them to 1000 (primary user) RUN apk --no-cache add shadow && usermod -u 1000 www-data && groupmod -g 1000 www-data - WORKDIR /www diff --git a/apps/php7/7.4.33/supervisor/run.sh b/apps/php7/7.4.33/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php7/7.4.33/supervisor/run.sh +++ b/apps/php7/7.4.33/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php8/8.0.30/build/.env b/apps/php8/8.0.30/build/.env index cc66164a..19953037 100644 --- a/apps/php8/8.0.30/build/.env +++ b/apps/php8/8.0.30/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:8.0.30 \ No newline at end of file +IMAGE_NAME=1panel-php:8.0.30 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php8/8.0.30/build/config.json b/apps/php8/8.0.30/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php8/8.0.30/build/config.json +++ b/apps/php8/8.0.30/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php8/8.0.30/build/docker-compose.yml b/apps/php8/8.0.30/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php8/8.0.30/build/docker-compose.yml +++ b/apps/php8/8.0.30/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php8/8.0.30/build/php/Dockerfile b/apps/php8/8.0.30/build/php/Dockerfile index b73a2003..5cc33441 100644 --- a/apps/php8/8.0.30/build/php/Dockerfile +++ b/apps/php8/8.0.30/build/php/Dockerfile @@ -22,8 +22,10 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/240 RUN apk add gnu-libiconv libstdc++ --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/edge/community/ --allow-untrusted diff --git a/apps/php8/8.0.30/supervisor/run.sh b/apps/php8/8.0.30/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php8/8.0.30/supervisor/run.sh +++ b/apps/php8/8.0.30/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php8/8.1.23/build/.env b/apps/php8/8.1.23/build/.env index 757faa75..cd280b4e 100644 --- a/apps/php8/8.1.23/build/.env +++ b/apps/php8/8.1.23/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:8.1.23 \ No newline at end of file +IMAGE_NAME=1panel-php:8.1.23 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php8/8.1.23/build/config.json b/apps/php8/8.1.23/build/config.json index 4906dcf8..02130101 100644 --- a/apps/php8/8.1.23/build/config.json +++ b/apps/php8/8.1.23/build/config.json @@ -5,7 +5,7 @@ "multiple": true, "labelZh": "扩展", "labelEn": "Extensions", - "default": [], + "default": ["mysqli","pdo_mysql"], "values": [ { "label": "opcache", @@ -110,6 +110,10 @@ "label": "gd", "value": "gd" }, + { + "label": "ioncube_loader", + "value": "ioncube_loader" + }, { "label": "curl", "value": "curl" @@ -125,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php8/8.1.23/build/docker-compose.yml b/apps/php8/8.1.23/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php8/8.1.23/build/docker-compose.yml +++ b/apps/php8/8.1.23/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php8/8.1.23/build/php/Dockerfile b/apps/php8/8.1.23/build/php/Dockerfile index b73a2003..5cc33441 100644 --- a/apps/php8/8.1.23/build/php/Dockerfile +++ b/apps/php8/8.1.23/build/php/Dockerfile @@ -22,8 +22,10 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/240 RUN apk add gnu-libiconv libstdc++ --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/edge/community/ --allow-untrusted diff --git a/apps/php8/8.1.23/supervisor/run.sh b/apps/php8/8.1.23/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php8/8.1.23/supervisor/run.sh +++ b/apps/php8/8.1.23/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi diff --git a/apps/php8/8.2.10/build/.env b/apps/php8/8.2.10/build/.env index 1ac92a5a..38a23597 100644 --- a/apps/php8/8.2.10/build/.env +++ b/apps/php8/8.2.10/build/.env @@ -10,4 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:8.2.10 \ No newline at end of file +IMAGE_NAME=1panel-php:8.2.10 +INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/apps/php8/8.2.10/build/config.json b/apps/php8/8.2.10/build/config.json index bda2e4eb..02130101 100644 --- a/apps/php8/8.2.10/build/config.json +++ b/apps/php8/8.2.10/build/config.json @@ -129,6 +129,23 @@ ], "envKey": "PHP_EXTENSIONS", "edit": true + }, + { + "type": "select", + "labelZh": "安装 Supervisor", + "labelEn": "Install Supervisor", + "default": "0", + "values": [ + { + "label": "否", + "value": "0" + }, + { + "label": "是", + "value": "1" + } + ], + "envKey": "INSTALL_SUPERVISOR" } ] } \ No newline at end of file diff --git a/apps/php8/8.2.10/build/docker-compose.yml b/apps/php8/8.2.10/build/docker-compose.yml index 76332ace..bc0eba06 100644 --- a/apps/php8/8.2.10/build/docker-compose.yml +++ b/apps/php8/8.2.10/build/docker-compose.yml @@ -8,6 +8,7 @@ services: CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} PHP_EXTENSIONS: ${PHP_EXTENSIONS} TZ: ${TZ} + INSTALL_SUPERVISOR: ${INSTALL_SUPERVISOR} image: ${IMAGE_NAME} volumes: - ${SOURCE_DIR}:/www/ diff --git a/apps/php8/8.2.10/build/php/Dockerfile b/apps/php8/8.2.10/build/php/Dockerfile index b73a2003..9f171818 100644 --- a/apps/php8/8.2.10/build/php/Dockerfile +++ b/apps/php8/8.2.10/build/php/Dockerfile @@ -22,9 +22,10 @@ RUN apk --no-cache add tzdata \ && cp "/usr/share/zoneinfo/$TZ" /etc/localtime \ && echo "$TZ" > /etc/timezone -RUN apk add supervisor \ - && mkdir -p /var/log/supervisor - +RUN if [ $INSTALL_SUPERVISOR = 1 ] ; then \ + apk add --no-cache supervisor && \ + mkdir -p /var/log/supervisor ; \ + fi # Fix: https://github.com/docker-library/php/issues/240 RUN apk add gnu-libiconv libstdc++ --no-cache --repository http://${CONTAINER_PACKAGE_URL}/alpine/edge/community/ --allow-untrusted ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php diff --git a/apps/php8/8.2.10/supervisor/run.sh b/apps/php8/8.2.10/supervisor/run.sh index 1af74853..492857bd 100644 --- a/apps/php8/8.2.10/supervisor/run.sh +++ b/apps/php8/8.2.10/supervisor/run.sh @@ -1,3 +1,5 @@ #!/bin/sh -supervisord -c /etc/supervisord.conf \ No newline at end of file +if command -v supervisord > /dev/null 2>&1; then + supervisord -c /etc/supervisord.conf +fi