Update Docker image to Ubuntu 16.04 and PHP 7.0
This commit is contained in:
parent
c3a85aa204
commit
3a1ac4ed1d
@ -2,7 +2,14 @@
|
|||||||
.git
|
.git
|
||||||
.gitignore
|
.gitignore
|
||||||
.github
|
.github
|
||||||
|
.gitattributes
|
||||||
.dockerignore
|
.dockerignore
|
||||||
.travis.yml
|
.travis.yml
|
||||||
tests
|
tests
|
||||||
scripts
|
scripts
|
||||||
|
config.php
|
||||||
|
composer.json
|
||||||
|
composer.lock
|
||||||
|
CONTRIBUTORS.md
|
||||||
|
Makefile
|
||||||
|
README.markdown
|
||||||
|
@ -14,6 +14,7 @@ Version 1.2.0 (unreleased)
|
|||||||
* Show last parsing error message in user interface
|
* Show last parsing error message in user interface
|
||||||
* Disable automatically a feed after too many failures
|
* Disable automatically a feed after too many failures
|
||||||
* Add support for Expires and Cache-Control headers (HTTP cache)
|
* Add support for Expires and Cache-Control headers (HTTP cache)
|
||||||
|
* Update Docker image to Ubuntu 16.04 and PHP 7.0
|
||||||
* Add unit tests
|
* Add unit tests
|
||||||
|
|
||||||
Migration procedure from 1.1.x to 1.2.0:
|
Migration procedure from 1.1.x to 1.2.0:
|
||||||
|
14
Dockerfile
14
Dockerfile
@ -1,8 +1,10 @@
|
|||||||
FROM ubuntu:14.04
|
FROM ubuntu:16.04
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y apache2 php5 php5-sqlite php5-curl && \
|
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
apache2 libapache2-mod-php7.0 php7.0-pgsql php7.0-sqlite3 php7.0-xml php7.0-mcrypt \
|
||||||
|
php7.0-opcache php7.0-mcrypt php7.0-mbstring php7.0-json php7.0-curl && \
|
||||||
|
apt-get clean
|
||||||
|
|
||||||
RUN echo \
|
RUN echo \
|
||||||
"ServerName localhost\n" \
|
"ServerName localhost\n" \
|
||||||
@ -23,10 +25,4 @@ VOLUME /var/www/html/data
|
|||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
ENV APACHE_RUN_USER www-data
|
|
||||||
ENV APACHE_RUN_GROUP www-data
|
|
||||||
ENV APACHE_LOG_DIR /var/log/apache2
|
|
||||||
ENV APACHE_LOCK_DIR /var/lock/apache2
|
|
||||||
ENV APACHE_PID_FILE /var/run/apache2.pid
|
|
||||||
|
|
||||||
CMD /usr/sbin/apache2ctl -D FOREGROUND
|
CMD /usr/sbin/apache2ctl -D FOREGROUND
|
||||||
|
Loading…
Reference in New Issue
Block a user