mirror of
https://github.com/shlinkio/shlink.git
synced 2024-11-21 16:38:37 -06:00
Udated minimum PHP version and docker stuff
This commit is contained in:
parent
a9d213990e
commit
d10583c7c5
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@ vendor/
|
|||||||
.env
|
.env
|
||||||
data/database.sqlite
|
data/database.sqlite
|
||||||
docs/swagger-ui
|
docs/swagger-ui
|
||||||
|
docker-compose.override.yml
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^5.6 || ^7.0",
|
"php": "^7.0",
|
||||||
"roave/security-advisories": "dev-master",
|
"roave/security-advisories": "dev-master",
|
||||||
"zendframework/zend-expressive": "^2.0",
|
"zendframework/zend-expressive": "^2.0",
|
||||||
"zendframework/zend-expressive-fastroute": "^2.0",
|
"zendframework/zend-expressive-fastroute": "^2.0",
|
||||||
@ -39,11 +39,12 @@
|
|||||||
"theorchard/monolog-cascade": "^0.4",
|
"theorchard/monolog-cascade": "^0.4",
|
||||||
"endroid/qrcode": "^1.7",
|
"endroid/qrcode": "^1.7",
|
||||||
"mikehaertl/phpwkhtmltopdf": "^2.2",
|
"mikehaertl/phpwkhtmltopdf": "^2.2",
|
||||||
"doctrine/migrations": "^1.4"
|
"doctrine/migrations": "^1.4",
|
||||||
|
"http-interop/http-middleware": "^0.4.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^5.7 || ^6.0",
|
"phpunit/phpunit": "^5.7 || ^6.0",
|
||||||
"squizlabs/php_codesniffer": "^2.3",
|
"squizlabs/php_codesniffer": "^3.1",
|
||||||
"filp/whoops": "^2.0",
|
"filp/whoops": "^2.0",
|
||||||
"symfony/var-dumper": "^3.0",
|
"symfony/var-dumper": "^3.0",
|
||||||
"vlucas/phpdotenv": "^2.2",
|
"vlucas/phpdotenv": "^2.2",
|
||||||
|
@ -26,7 +26,7 @@ RUN apk add --no-cache --virtual libpng-dev
|
|||||||
RUN docker-php-ext-install gd
|
RUN docker-php-ext-install gd
|
||||||
|
|
||||||
# Install redis extension
|
# Install redis extension
|
||||||
ADD https://github.com/phpredis/phpredis/archive/php7.tar.gz /tmp/phpredis.tar.gz
|
ADD https://github.com/phpredis/phpredis/archive/3.1.4.tar.gz /tmp/phpredis.tar.gz
|
||||||
RUN mkdir -p /usr/src/php/ext/redis\
|
RUN mkdir -p /usr/src/php/ext/redis\
|
||||||
&& tar xf /tmp/phpredis.tar.gz -C /usr/src/php/ext/redis --strip-components=1
|
&& tar xf /tmp/phpredis.tar.gz -C /usr/src/php/ext/redis --strip-components=1
|
||||||
# configure and install
|
# configure and install
|
||||||
@ -85,3 +85,6 @@ RUN rm /tmp/xdebug.tar.gz
|
|||||||
RUN php -r "readfile('https://getcomposer.org/installer');" | php
|
RUN php -r "readfile('https://getcomposer.org/installer');" | php
|
||||||
RUN chmod +x composer.phar
|
RUN chmod +x composer.phar
|
||||||
RUN mv composer.phar /usr/local/bin/composer
|
RUN mv composer.phar /usr/local/bin/composer
|
||||||
|
|
||||||
|
# Make home directory writable by anyone
|
||||||
|
RUN chmod 777 /home
|
||||||
|
8
docker-compose.override.yml.dist
Normal file
8
docker-compose.override.yml.dist
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
version: '2'
|
||||||
|
|
||||||
|
services:
|
||||||
|
shlink_php:
|
||||||
|
user: 1000:1000
|
||||||
|
volumes:
|
||||||
|
- /etc/passwd:/etc/passwd:ro
|
||||||
|
- /etc/group:/etc/group:ro
|
Loading…
Reference in New Issue
Block a user