Docker image alternative using Ubuntu (#2205)
* Docker image alternative using Ubuntu
Ubuntu seems to be faster, cf. e.g. PHPBench.
It is quite usual for Docker images to offer both a Debian/Ubuntu and an
Alpine version, so we could also do the same if there is any need.
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/2202
* Only explicit use of Apache confs
Fix double-logging issue
* Explicit ServerTokens OS
Default Apache configuration in Ubuntu, which was removed when disabling all confs.
It is also the default Apache configuration in Alpine.
* Take advantage of syslog for actualization
Same than for Alpine
43ab629e27
* COPY_SYSLOG_TO_STDERR
Same as https://github.com/FreshRSS/FreshRSS/pull/2213
* Update to libapache2-mod-php instead of php-fpm
* Default to Ubuntu
Ubuntu mod-php wins, being ~14% faster than Ubuntu php-fpm (which was ~300% faster than Alpine mod-php)
pull/2259/head
parent
b869c2944a
commit
fc8fb0a7ee
3 changed files with 59 additions and 20 deletions
@ -0,0 +1,34 @@ |
||||
FROM alpine:3.9 |
||||
|
||||
ENV TZ UTC |
||||
|
||||
RUN apk add --no-cache \ |
||||
apache2 php7-apache2 \ |
||||
php7 php7-curl php7-gmp php7-intl php7-mbstring php7-xml php7-zip \ |
||||
php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session php7-simplexml php7-xmlreader php7-zlib \ |
||||
php7-pdo_sqlite php7-pdo_mysql php7-pdo_pgsql |
||||
|
||||
RUN mkdir -p /var/www/FreshRSS /run/apache2/ |
||||
WORKDIR /var/www/FreshRSS |
||||
|
||||
COPY . /var/www/FreshRSS |
||||
COPY ./Docker/*.Apache.conf /etc/apache2/conf.d/ |
||||
|
||||
RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ |
||||
/etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ |
||||
sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ |
||||
/etc/apache2/httpd.conf && \ |
||||
sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|setenvif).so$/s/^\s*#//" \ |
||||
/etc/apache2/httpd.conf && \ |
||||
sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ |
||||
/etc/apache2/httpd.conf && \ |
||||
echo "17,37 * * * * su apache -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" >> \ |
||||
/var/spool/cron/crontabs/root |
||||
|
||||
ENV COPY_SYSLOG_TO_STDERR On |
||||
ENV CRON_MIN '' |
||||
ENTRYPOINT ["./Docker/entrypoint.sh"] |
||||
|
||||
EXPOSE 80 |
||||
CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ |
||||
exec httpd -D FOREGROUND |
Loading…
Reference in new issue