Add fpm handling in docker-entrypoint.sh #92
Merged
Conversation
This file contains hidden or 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
| @@ -1,7 +1,7 @@ | |||
| #!/bin/bash | |||
| set -e | |||
|
|
|||
| if [[ "$1" == apache2* ]]; then | |||
| if [[ "$1" == apache2* ]] || [[ "$1" == php-fpm ]]; then | |||
There was a problem hiding this comment.
The new test can be a simple [ "$1" == php-fpm ] since it doesn't have a wildcard in it.
|
Good catch! 👍 |
… a wildcard in it.
|
md5, I've pushed a fix regarding your last comment, cheers. |
|
It would be awesome if we could merge this, the fpm support is unusable at the moment |
|
LGTM |
1 similar comment
|
LGTM |
yosifkit
added a commit
that referenced
this pull request
Aug 11, 2015
Add fpm handling in docker-entrypoint.sh
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Aug 11, 2015
- `celery`: docker-library/celery@033c91f - `elasticsearch`: docker-library/elasticsearch@4e491a7 - `ghost`: docker-library/ghost@7200faa - `hello-world`: docker-library/hello-world@2224815 - `irssi`: jessfraz/irssi@46f8d10 - `mongo`: 2.6.11 - `mysql`: `skip-name-resolve` (docker-library/mysql#89) - `owncloud`: 7.0.8 and 8.1.1 - `php`: docker-library/php@7575282 - `postgres`: 9.5~alpha2-1.pgdg80+1 - `redis`: redis/docker-library-redis@d2877d5 - `redmine`: infosiftr/redmine@dbd8af6 - `ruby`: `--no-document` (docker-library/ruby#49) - `wordpress`: fix FPM support (docker-library/wordpress#92)
Closed
RichardScothern
pushed a commit
to RichardScothern/official-images
that referenced
this pull request
Jun 14, 2016
- `celery`: docker-library/celery@033c91f - `elasticsearch`: docker-library/elasticsearch@4e491a7 - `ghost`: docker-library/ghost@7200faa - `hello-world`: docker-library/hello-world@2224815 - `irssi`: jessfraz/irssi@46f8d10 - `mongo`: 2.6.11 - `mysql`: `skip-name-resolve` (docker-library/mysql#89) - `owncloud`: 7.0.8 and 8.1.1 - `php`: docker-library/php@7575282 - `postgres`: 9.5~alpha2-1.pgdg80+1 - `redis`: redis/docker-library-redis@d2877d5 - `redmine`: infosiftr/redmine@dbd8af6 - `ruby`: `--no-document` (docker-library/ruby#49) - `wordpress`: fix FPM support (docker-library/wordpress#92)
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.
Hi
Feel free to merge this small modification to also handle fpm in entrypoint.sh.
The script had a test that was executed only for apache variant.
cheers