Skip to content

Commit

Permalink
fix: restore default docker build (#33)
Browse files Browse the repository at this point in the history
* fix: restore default docker build

local run of 'staging' for default environment,
recreated and allowed for under !.gitignore
= restores ability to run docker-compose locally
without first installing any language support (no PHP nor PY)

refs:
issues:  missing functionality of 7.4 release

* feat: update xdebug php extension

By default it would of installed an incompatible version of xdebug

* feat: Fixed git ignore entry

The default stage dir is the only stage dir to be checked into source
control.

Co-authored-by: D.Crannaford <derek@2pisoftware.com>
Co-authored-by: Thomas <11610634+twje@users.noreply.github.com>
  • Loading branch information
3 people authored Mar 26, 2021
1 parent 2e710d4 commit 417b609
Show file tree
Hide file tree
Showing 10 changed files with 2,318 additions and 2 deletions.
58 changes: 58 additions & 0 deletions .build/environment/default/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# ubuntu version limited for simple mysql5.7 packaging
FROM ubuntu:18.04

# prevent install locking up o TZ or other user inputs
ENV DEBIAN_FRONTEND=noninteractive

# set up basics for apt-get'ting
RUN apt-get update
RUN apt-get install -y software-properties-common
RUN add-apt-repository ppa:ondrej/php
RUN apt-get install -y locales-all

# allow retries & break up apt-get for recovery
# of build from apt cache in case of connection failures
RUN apt-get install -y -o "APT::Acquire::Retries=6" \
vim supervisor nginx gnupg2

RUN apt-get install -y -o "APT::Acquire::Retries=6" \
php7.4-fpm

RUN apt-get update
RUN apt-get install -y -o "APT::Acquire::Retries=6" \
php7.4-zip \
php7.4-curl \
php7.4-gd \
php7.4-json \
php7.4-mysql \
php7.4-xml \
php7.4-bcmath \
php7.4-mbstring

# toolbox extras, to allow for DB commands & subnet examination etc
RUN apt-get update
RUN apt-get install -y -o "APT::Acquire::Retries=6" \
git \
iputils-ping \
curl \
mysql-client-5.7

# PHP extras, for test+debug
RUN apt-get update
RUN apt-get install -y -o "APT::Acquire::Retries=6" \
phpunit \
php7.4-xdebug

# bootstrap environment
WORKDIR /bootstrap
COPY ./stage .

RUN cp fpm/* /etc/php/7.4/fpm/
RUN cp nginx/nginx.conf /etc/nginx/nginx.conf
RUN cp nginx/default.conf /etc/nginx/conf.d/default.conf
RUN cp supervisord.conf /etc/supervisord.conf

RUN mkdir /run/php

RUN chmod -R 777 start.sh
CMD ["/bootstrap/start.sh"]
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN apt-get install -y -o "APT::Acquire::Retries=6" \
RUN apt-get update
RUN apt-get install -y -o "APT::Acquire::Retries=6" \
phpunit \
php-xdebug
php{{php_version}}-xdebug

# bootstrap environment
WORKDIR /bootstrap
Expand Down
127 changes: 127 additions & 0 deletions .build/environment/default/stage/fpm/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
;;;;;;;;;;;;;;;;;;;;;
; FPM Configuration ;
;;;;;;;;;;;;;;;;;;;;;

; All relative paths in this configuration file are relative to PHP's install
; prefix (/usr). This prefix can be dynamically changed by using the
; '-p' argument from the command line.

;;;;;;;;;;;;;;;;;;
; Global Options ;
;;;;;;;;;;;;;;;;;;

[global]
; Pid file
; Note: the default prefix is /var
; Default Value: none
pid = /run/php/php7.4-fpm.pid

; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written
; into a local file.
; Note: the default prefix is /var
; Default Value: log/php-fpm.log
error_log = /var/log/php7.4-fpm.log

; syslog_facility is used to specify what type of program is logging the
; message. This lets syslogd specify that messages from different facilities
; will be handled differently.
; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
; Default Value: daemon
;syslog.facility = daemon

; syslog_ident is prepended to every message. If you have multiple FPM
; instances running on the same server, you can change the default value
; which must suit common needs.
; Default Value: php-fpm
;syslog.ident = php-fpm

; Log level
; Possible Values: alert, error, warning, notice, debug
; Default Value: notice
;log_level = notice

; If this number of child processes exit with SIGSEGV or SIGBUS within the time
; interval set by emergency_restart_interval then FPM will restart. A value
; of '0' means 'Off'.
; Default Value: 0
;emergency_restart_threshold = 0

; Interval of time used by emergency_restart_interval to determine when
; a graceful restart will be initiated. This can be useful to work around
; accidental corruptions in an accelerator's shared memory.
; Available Units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
;emergency_restart_interval = 0

; Time limit for child processes to wait for a reaction on signals from master.
; Available units: s(econds), m(inutes), h(ours), or d(ays)
; Default Unit: seconds
; Default Value: 0
;process_control_timeout = 0

; The maximum number of processes FPM will fork. This has been designed to control
; the global number of processes when using dynamic PM within a lot of pools.
; Use it with caution.
; Note: A value of 0 indicates no limit
; Default Value: 0
; process.max = 128

; Specify the nice(2) priority to apply to the master process (only if set)
; The value can vary from -19 (highest priority) to 20 (lowest priority)
; Note: - It will only work if the FPM master process is launched as root
; - The pool process will inherit the master process priority
; unless specified otherwise
; Default Value: no set
; process.priority = -19

; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
; Default Value: yes
;daemonize = yes

; Set open file descriptor rlimit for the master process.
; Default Value: system defined value
;rlimit_files = 1024

; Set max core size rlimit for the master process.
; Possible Values: 'unlimited' or an integer greater or equal to 0
; Default Value: system defined value
;rlimit_core = 0

; Specify the event mechanism FPM will use. The following is available:
; - select (any POSIX os)
; - poll (any POSIX os)
; - epoll (linux >= 2.5.44)
; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
; - /dev/poll (Solaris >= 7)
; - port (Solaris >= 10)
; Default Value: not set (auto detection)
;events.mechanism = epoll

; When FPM is built with systemd integration, specify the interval,
; in seconds, between health report notification to systemd.
; Set to 0 to disable.
; Available Units: s(econds), m(inutes), h(ours)
; Default Unit: seconds
; Default value: 10
;systemd_interval = 10

;;;;;;;;;;;;;;;;;;;;
; Pool Definitions ;
;;;;;;;;;;;;;;;;;;;;

; Multiple pools of child processes may be started with different listening
; ports and different management options. The name of the pool will be
; used in logs and stats. There is no limitation on the number of pools which
; FPM can handle. Your system will tell you anyway :)

; Include one or more files. If glob(3) exists, it is used to include a bunch of
; files from a glob(3) pattern. This directive can be used everywhere in the
; file.
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
; - /usr otherwise
include=/etc/php/7.4/fpm/pool.d/*.conf
clear_env = no
;include=/etc/php/7.4/fpm/env.conf
Loading

0 comments on commit 417b609

Please sign in to comment.