-
Notifications
You must be signed in to change notification settings - Fork 5
Adding PHP 7.4 #20
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tekante
wants to merge
1
commit into
master
Choose a base branch
from
php74
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Adding PHP 7.4 #20
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| FROM outrigger/apache-php-base | ||
|
|
||
| RUN yum -y install \ | ||
| https://rpms.remirepo.net/enterprise/remi-release-7.rpm && \ | ||
| yum -y install \ | ||
| gcc-c++ \ | ||
| make \ | ||
| php74 \ | ||
| php74-php-bcmath \ | ||
| php74-php-devel \ | ||
| php74-php-fpm \ | ||
| php74-php-gd \ | ||
| php74-php-mbstring \ | ||
| php74-php-mcrypt \ | ||
| php74-php-pecl-memcached \ | ||
| php74-php-mysql \ | ||
| php74-php-mysqlnd \ | ||
| php74-php-opcache \ | ||
| php74-php-pdo \ | ||
| php74-php-pecl-xdebug \ | ||
| php74-php-xml \ | ||
| php74-php-pecl-yaml \ | ||
| php74-php-pecl-zip && \ | ||
| # There is no PHP 7 support for XHProf yet. | ||
| # php74-php-pecl-xhprof | ||
| yum clean all | ||
|
|
||
| ENV PHP_HOME /opt/remi/php74 | ||
| RUN ln -sfv ${PHP_HOME}/root/usr/bin/* /usr/bin/ && \ | ||
| ln -sfv ${PHP_HOME}/root/usr/sbin/* /usr/sbin/ && \ | ||
| ln -sfv /dev/stderr /var${PHP_HOME}/log/php-fpm/error.log | ||
|
|
||
| # Install phpredis | ||
| ENV PHPREDIS_VERSION 3.1.5 | ||
| RUN curl -L -o /tmp/phpredis.tar.gz "https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz" && \ | ||
| tar -xzf /tmp/phpredis.tar.gz -C /tmp && \ | ||
| rm /tmp/phpredis.tar.gz && \ | ||
| cd "/tmp/phpredis-$PHPREDIS_VERSION" && \ | ||
| phpize && \ | ||
| ./configure && \ | ||
| make && \ | ||
| make install && \ | ||
| # Clean up build dependencies. | ||
| yum -y remove gcc-c++ make php74-php-devel && \ | ||
| yum clean all | ||
|
|
||
| COPY root / | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| [template] | ||
| src = "www.conf.tmpl" | ||
| dest = "/etc/opt/remi/php74/php-fpm.d/www.conf" | ||
| uid = 0 | ||
| gid = 0 | ||
| mode = "0644" | ||
| keys = [] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| [template] | ||
| src = "xdebug.ini.tmpl" | ||
| dest = "/etc/opt/remi/php74/php.d/15-xdebug.ini" | ||
| uid = 0 | ||
| gid = 0 | ||
| mode = "0644" | ||
| keys = [] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| [template] | ||
| src = "xhprof.ini.tmpl" | ||
| dest = "/etc/opt/remi/php74/php.d/15-xhprof.ini" | ||
| uid = 0 | ||
| gid = 0 | ||
| mode = "0644" | ||
| keys = [] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| [template] | ||
| src = "yaml.ini.tmpl" | ||
| dest = "/etc/opt/remi/php74/php.d/40-yaml.ini" | ||
| uid = 0 | ||
| gid = 0 | ||
| mode = "0644" | ||
| keys = [] |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /var/log/httpd true apache 0644 0755 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| extension=redis.so |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #!/usr/bin/with-contenv sh | ||
|
|
||
| exec php-fpm -F -R |
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this PR https://github.com/phase2/docker-build/pull/47/files#diff-ce24a4205ce621c14ac1849960b386aaR38 you're bring in
php74-php-pecl-memcachewas this intentional?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I copied the php73 files and then search/replaced them so I'm not sure why that difference is there. It seems like we would want to be consistent between them so I'll troll through the git logs and see if I can spot anything about why either one was picked. Good catch.