diff --git a/app/DockerfileDev b/app/DockerfileDev deleted file mode 100644 index d73642d36f40ee13501694a24974fb6cbdc8f41d..0000000000000000000000000000000000000000 --- a/app/DockerfileDev +++ /dev/null @@ -1,67 +0,0 @@ -FROM alpine:3.11.3 - -RUN apk add --update \ - nginx \ - tzdata \ - ca-certificates \ - dcron \ - zip \ - redis \ - php7 \ - php7-fpm \ - php7-common \ - php7-curl \ - php7-mbstring \ - php7-sqlite3 \ - php7-pdo_mysql \ - php7-pdo_sqlite \ - php7-dom \ - php7-simplexml \ - php7-tokenizer \ - php7-zip \ - php7-redis \ - php7-gd \ - php7-json \ - php7-pcntl \ - php7-fileinfo \ - php7-xdebug \ - && rm -rf /var/cache/apk/* - -WORKDIR /html - -RUN sed -i 's/;error_log = log\/php7\/error.log/error_log = \/dev\/stderr/g' /etc/php7/php-fpm.conf && \ - sed -i 's/;daemonize = yes/daemonize = no/g' /etc/php7/php-fpm.conf && \ - sed -i 's/listen = 127.0.0.1:9000/listen = 9000/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/;request_terminate_timeout = 0/request_terminate_timeout = 900/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/;request_terminate_timeout_track_finished = no/request_terminate_timeout_track_finished = yes/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/;decorate_workers_output = no/decorate_workers_output = no/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/;catch_workers_output = yes/catch_workers_output = yes/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/user = nobody/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/group = nobody/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/pm.max_children = 5/pm.max_children = 100/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/pm.start_servers = 2/pm.start_servers = 5/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/pm.min_spare_servers = 1/pm.min_spare_servers = 5/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/pm.max_spare_servers = 3/pm.max_spare_servers = 25/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/user = www-data/user = nginx/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/group = www-data/group = nginx/g' /etc/php7/php-fpm.d/www.conf && \ - sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7/php.ini && \ - sed -i 's/expose_php = On/expose_php = Off/g' /etc/php7/php.ini && \ - sed -i 's/;zend_extension=xdebug.so/zend_extension=xdebug.so/g' /etc/php7/conf.d/xdebug.ini && \ - echo "xdebug.remote_enable = 1" >> /etc/php7/conf.d/xdebug.ini && \ - echo "xdebug.remote_autostart = 1" >> /etc/php7/conf.d/xdebug.ini && \ - echo "xdebug.remote_connect_back = 1" >> /etc/php7/conf.d/xdebug.ini && \ - echo "xdebug.idekey=VSCODE" >> /etc/php7/conf.d/xdebug.ini && \ - echo "daemonize yes" >> /etc/redis.conf && \ - ln -s /dev/null /var/log/nginx/access.log && \ - ln -s /dev/stdout /var/log/nginx/error.log && \ - cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime && \ - echo "Europe/Berlin" > /etc/timezone && \ - (crontab -l ; echo "* * * * * php /html/artisan schedule:run >> /dev/null 2>&1") | crontab - - -WORKDIR /html -EXPOSE 80 - -CMD chown -R root:nginx storage/ bootstrap/cache && \ - chmod -R g+w storage/ bootstrap/cache && \ - crond -L /dev/stdout && \ - php-fpm7 diff --git a/app/docker-compose.yml b/app/docker-compose.yml deleted file mode 100644 index d153ec29f2bcd3f88b8df94a6c36e8b788506893..0000000000000000000000000000000000000000 --- a/app/docker-compose.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: '3.7' -services: - phpdeps: - image: registry.metager.de/open-source/composer/master - working_dir: /app - volumes: - - .:/app - - .composer:/root/.composer - command: composer install - assets: - image: node:10 - volumes: - - .:/usr/src/app - working_dir: /usr/src/app - command: bash -c "npm install && npm run watch" - phpfpm: - depends_on: - - "phpdeps" - - "assets" - restart: on-failure - build: - context: . - dockerfile: DockerfileDev - image: metagermaps:latest - working_dir: /html - volumes: - - .:/html - nginx: - depends_on: - - "phpfpm" - restart: on-failure - image: metagermaps:latest - working_dir: /html - command: nginx - volumes: - - .:/html - - ./config/nginx.conf:/etc/nginx/nginx.conf - - ./config/nginx-default-dev.conf:/etc/nginx/conf.d/default.conf - ports: - - "8080:80" - init: - depends_on: - - "phpfpm" - restart: on-failure - image: metagermaps:latest - working_dir: /html - command: /bin/sh init.sh - volumes: - - .:/html \ No newline at end of file diff --git a/build/fpm/Dockerfile b/build/fpm/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..55265dd2f74623d652ce041eb39d4961d0a56c3c --- /dev/null +++ b/build/fpm/Dockerfile @@ -0,0 +1,44 @@ +FROM alpine:3.11.3 as base + +RUN apk add --update \ + tzdata \ + ca-certificates \ + zip \ + redis \ + php7 \ + php7-fpm \ + php7-xdebug \ + && rm -rf /var/cache/apk/* + +RUN cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime + +RUN adduser mgmaps -h /html -D -s /bin/sh -k /dev/null +USER mgmaps + +WORKDIR /html +EXPOSE 80 + +FROM base as development + +USER root + +# Add common configurations development & production +ADD configuration/common/*.ini /etc/php7/conf.d/ +ADD configuration/common/*.conf /etc/php7/php-fpm.d/ + +# Add development only configuration +ADD configuration/development/*.ini /etc/php7/conf.d/ +ADD configuration/development/*.conf /etc/php7/php-fpm.d/ + +CMD php-fpm7 --nodaemonize + +USER mgmaps + +FROM development as production + +USER root + +RUN apk delete php7-xdebug +RUN rm /etc/php7/conf.d/xdebug.ini + +USER mgmaps \ No newline at end of file diff --git a/build/fpm/configuration/.gitignore b/build/fpm/configuration/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..04ed9a218faf444ed1123b3cb3468ec3ab892766 --- /dev/null +++ b/build/fpm/configuration/.gitignore @@ -0,0 +1 @@ +php.ini.default \ No newline at end of file diff --git a/build/fpm/configuration/common/common.ini b/build/fpm/configuration/common/common.ini new file mode 100644 index 0000000000000000000000000000000000000000..bc22a684239b0811a7c5ba2ec3ec82cefcbc3b42 --- /dev/null +++ b/build/fpm/configuration/common/common.ini @@ -0,0 +1,3 @@ +error_log = "/dev/stderr" +date.timezone = "Europe/Berlin" +cgi.fix_pathinfo = 0 \ No newline at end of file diff --git a/build/fpm/configuration/common/fpm.conf b/build/fpm/configuration/common/fpm.conf new file mode 100644 index 0000000000000000000000000000000000000000..8c14ae1fa0273f45cea0c76b7cc1846efe5b007d --- /dev/null +++ b/build/fpm/configuration/common/fpm.conf @@ -0,0 +1,3 @@ +[global] + +error_log = syslog \ No newline at end of file diff --git a/build/fpm/configuration/common/www.conf b/build/fpm/configuration/common/www.conf new file mode 100644 index 0000000000000000000000000000000000000000..d53f1c3234f36823ad228c4069a9c70f8c41f2ca --- /dev/null +++ b/build/fpm/configuration/common/www.conf @@ -0,0 +1,438 @@ +; Start a new pool named 'www'. +; the variable $pool can be used in any directive and will be replaced by the +; pool name ('www' here) +[www] + +; Per pool prefix +; It only applies on the following directives: +; - 'access.log' +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. +; user = nobody +; group = nobody + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +listen = 9000 + +; Set listen(2) backlog. +; Default Value: 511 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 511 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0660 +;listen.owner = nobody +;listen.group = nobody +;listen.mode = 0660 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = + +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 + +; Specify the nice(2) priority to apply to the pool processes (only if set) +; The value can vary from -19 (highest priority) to 20 (lower priority) +; Note: - It will only work if the FPM master process is launched as root +; - The pool processes will inherit the master process priority +; unless it specified otherwise +; Default Value: no set +; process.priority = -19 + +; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user +; or group is differrent than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes + +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. +pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. +pm.max_children = 50 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +pm.start_servers = 4 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.min_spare_servers = 4 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +pm.max_spare_servers = 8 + +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: /usr/share/php7/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/php7/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: output header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/php7/$pool.slow.log + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; Depth of slow log stack trace. +; Default Value: 20 +;request_slowlog_trace_depth = 20 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; The timeout set by 'request_terminate_timeout' ini option is not engaged after +; application calls 'fastcgi_finish_request' or when application has finished and +; shutdown functions are being called (registered via register_shutdown_function). +; This option will enable timeout limit to be applied unconditionally +; even in such cases. +; Default Value: no +request_terminate_timeout_track_finished = yes + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +catch_workers_output = yes + +; Decorate worker output with prefix and suffix containing information about +; the child that writes to the log and if stdout or stderr is used as well as +; log level and time. This options is used only if catch_workers_output is yes. +; Settings to "no" will output data as written to the stdout or stderr. +; Default value: yes +decorate_workers_output = yes + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; execute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 .php7 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env +;env[HOSTNAME] = $HOSTNAME +;env[PATH] = /usr/local/bin:/usr/bin:/bin +;env[TMP] = /tmp +;env[TMPDIR] = /tmp +;env[TEMP] = /tmp + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument +;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com +;php_flag[display_errors] = off +;php_admin_value[error_log] = /var/log/php7/$pool.error.log +;php_admin_flag[log_errors] = on +;php_admin_value[memory_limit] = 32M diff --git a/build/fpm/configuration/development/php.ini b/build/fpm/configuration/development/php.ini new file mode 100644 index 0000000000000000000000000000000000000000..593241f029c267be96e16e4c6043562a208e52cc --- /dev/null +++ b/build/fpm/configuration/development/php.ini @@ -0,0 +1,4 @@ +expose_php = On +max_execution_time = 0 +display_errors = stderr +display_startup_errors = On \ No newline at end of file diff --git a/build/fpm/configuration/development/www-custom.conf b/build/fpm/configuration/development/www-custom.conf new file mode 100644 index 0000000000000000000000000000000000000000..d2526e0749f47b07d91af9bd706f050ffa834270 --- /dev/null +++ b/build/fpm/configuration/development/www-custom.conf @@ -0,0 +1,2 @@ +[www] +request_terminate_timeout = 0 \ No newline at end of file diff --git a/build/fpm/configuration/development/xdebug.ini b/build/fpm/configuration/development/xdebug.ini new file mode 100644 index 0000000000000000000000000000000000000000..a2f99427f3ed085c05ecddd6e47e644497cd6011 --- /dev/null +++ b/build/fpm/configuration/development/xdebug.ini @@ -0,0 +1,5 @@ +zend_extension=xdebug.so +xdebug.remote_enable = 1 +xdebug.remote_autostart = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey=VSCODE \ No newline at end of file diff --git a/build/fpm/configuration/production/php.ini b/build/fpm/configuration/production/php.ini new file mode 100644 index 0000000000000000000000000000000000000000..31c50e91e85fe04707be011410203ccf03424fc7 --- /dev/null +++ b/build/fpm/configuration/production/php.ini @@ -0,0 +1,4 @@ +expose_php = Off +max_execution_time = 30 +display_errors = Off +display_startup_errors = Off \ No newline at end of file diff --git a/build/fpm/configuration/production/www-custom.conf b/build/fpm/configuration/production/www-custom.conf new file mode 100644 index 0000000000000000000000000000000000000000..8d2d49a96fc88c527f1a0d0bd3e2e32a18bc6420 --- /dev/null +++ b/build/fpm/configuration/production/www-custom.conf @@ -0,0 +1,3 @@ +[www] + +request_terminate_timeout = 60 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000000000000000000000000000000000..1e68e67e540b9e23ce42e54b003e263c82a0e18d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: "3" +services: + fpm: + restart: unless-stopped + build: + context: ./build/fpm + target: development + image: metagermaps:latest + working_dir: /html + volumes: + - ./app:/html