Skip to content

Commit

Permalink
Update to PHP-FPM 7.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
colinwilson committed Apr 16, 2017
1 parent c1df4c8 commit 355fbb0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is a [Craft CMS](https://craftcms.com/) base running on our [nginx-php-fpm

Features:

- Nginx 1.11.x, PHP-FPM 7.0.x
- Nginx 1.11.x, PHP-FPM 7.1.x, MariaDB 10.1.x
- Redis caching
- imageMagick image manipulation library

Expand All @@ -19,7 +19,7 @@ $ sudo docker-compose build
## Running
To run the container:
```
$ sudo docker-compose up
$ sudo docker-compose up -d
```

navigate to `your-ip-address/admin` to see Craft's installation page.
8 changes: 0 additions & 8 deletions config/rediscache.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<?php

/**
* DO NOT EDIT THIS FILE.
*
* This file is subject to be overwritten by a Craft update at any time.
*
* If you want to change any of these settings, copy it into craft/config/rediscache.php, and make your change there.
*/

return array(
/**
* Hostname to use for connecting to the redis server. Defaults to 'localhost'.
Expand Down
2 changes: 1 addition & 1 deletion default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ server {
location ~ \.php$ {
try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/run/php/php7.0-fpm.sock;
fastcgi_pass unix:/run/php/php7.1-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
Expand Down

0 comments on commit 355fbb0

Please sign in to comment.