Refactor FPM support to use upstream's config file directly #184
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PHP 7 changed their config to use "include", which is a clever way to support "php-fpm.d" for further configuration. This adapts our FPM config to follow suit.
|
LGTM Docs? 🙏 😊 |
yosifkit
added a commit
that referenced
this pull request
Jan 22, 2016
Refactor FPM support to use upstream's config file directly
|
NEVAR |
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Jan 26, 2016
- `cassandra`: 3.2 (docker-library/cassandra#47) - `celery`: 3.1.20 - `mariadb`: resync entrypoint with MySQL (MariaDB/mariadb-docker#37, MariaDB/mariadb-docker#34) - `memcached`: fix SHA1 checking (docker-library/memcached#6) - `mongo`: 3.0.9, conditional chown, configdb (MariaDB/mariadb-docker#78) - `mysql`: fix init failure a bit (docker-library/mysql#134) - `percona`: resync entrypoint with MySQL (docker-library/percona#12) - `php`: update FPM to use `php-fpm.d` for config (docker-library/php#184) - `postgres`: remove EOL 9.0 (docker-library/postgres#122) - `python`: remove EOL 3.2 (docker-library/python#87) - `rabbitmq`: allow for `--user` to work (docker-library/rabbitmq#60) - `rails`: 4.2.5.1 - `redmine`: add SCMs (docker-library/redmine#9) - `rocket.chat`: 0.15.0 (RocketChat/Docker.Official.Image#13) - `ruby`: silence `root` warning (docker-library/ruby#63)
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Jan 26, 2016
- `cassandra`: 3.2 (docker-library/cassandra#47) - `celery`: 3.1.20 - `mariadb`: resync entrypoint with MySQL (MariaDB/mariadb-docker#37, MariaDB/mariadb-docker#34) - `memcached`: fix SHA1 checking (docker-library/memcached#6) - `mongo`: 3.0.9, conditional chown, configdb (MariaDB/mariadb-docker#78) - `mysql`: fix init failure a bit (docker-library/mysql#134) - `percona`: resync entrypoint with MySQL (docker-library/percona#12) - `php`: update FPM to use `php-fpm.d` for config (docker-library/php#184) - `postgres`: remove EOL 9.0 (docker-library/postgres#122) - `python`: remove EOL 3.2 (docker-library/python#87) - `rabbitmq`: allow for `--user` to work (docker-library/rabbitmq#60) - `rails`: 4.2.5.1 - `redmine`: add SCMs (docker-library/redmine#9) - `rocket.chat`: 0.15.0 (RocketChat/Docker.Official.Image#13) - `ruby`: silence `root` warning (docker-library/ruby#63)
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Jan 26, 2016
- `cassandra`: 3.2 (docker-library/cassandra#47), run as non-root and allow arbitrary `--user` (docker-library/cassandra#48) - `celery`: 3.1.20 - `mariadb`: resync entrypoint with MySQL (MariaDB/mariadb-docker#37, MariaDB/mariadb-docker#34) - `memcached`: fix SHA1 checking (docker-library/memcached#6) - `mongo`: 3.0.9, conditional chown, configdb (MariaDB/mariadb-docker#78) - `mysql`: fix init failure a bit (docker-library/mysql#134) - `percona`: resync entrypoint with MySQL (docker-library/percona#12) - `php`: update FPM to use `php-fpm.d` for config (docker-library/php#184) - `postgres`: remove EOL 9.0 (docker-library/postgres#122) - `python`: remove EOL 3.2 (docker-library/python#87) - `rabbitmq`: allow for arbitrary `--user` (docker-library/rabbitmq#60) - `rails`: 4.2.5.1 - `redmine`: add SCMs (docker-library/redmine#9) - `rocket.chat`: 0.15.0 (RocketChat/Docker.Official.Image#13) - `ruby`: silence `root` warning (docker-library/ruby#63)
RichardScothern
pushed a commit
to RichardScothern/official-images
that referenced
this pull request
Jun 14, 2016
- `cassandra`: 3.2 (docker-library/cassandra#47), run as non-root and allow arbitrary `--user` (docker-library/cassandra#48) - `celery`: 3.1.20 - `mariadb`: resync entrypoint with MySQL (MariaDB/mariadb-docker#37, MariaDB/mariadb-docker#34) - `memcached`: fix SHA1 checking (docker-library/memcached#6) - `mongo`: 3.0.9, conditional chown, configdb (MariaDB/mariadb-docker#78) - `mysql`: fix init failure a bit (docker-library/mysql#134) - `percona`: resync entrypoint with MySQL (docker-library/percona#12) - `php`: update FPM to use `php-fpm.d` for config (docker-library/php#184) - `postgres`: remove EOL 9.0 (docker-library/postgres#122) - `python`: remove EOL 3.2 (docker-library/python#87) - `rabbitmq`: allow for arbitrary `--user` (docker-library/rabbitmq#60) - `rails`: 4.2.5.1 - `redmine`: add SCMs (docker-library/redmine#9) - `rocket.chat`: 0.15.0 (RocketChat/Docker.Official.Image#13) - `ruby`: silence `root` warning (docker-library/ruby#63)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PHP 7 changed their config to use "include", which is a clever way to support "php-fpm.d" for further configuration. This adapts our FPM config to follow suit.
See #162 (comment) for the discussion that led up to this. This slims the config we add to just the bits required to make FPM work well in Docker, leaving all other details officially up to upstream's discretion.