cleanup

Dockerfile

@@ -1,9 +1,25 @@
-FROM ubuntu:18.04
-MAINTAINER Hanjo Meinhardt <hanjo@bunix.de>
+FROM ubuntu:18.04 AS builder
 
 ARG TTRSS_GIT_TAG=master
+ARG FEEDLY_GIT_TAG=master
+
+# install curl to fetch stuff
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  curl
+
+# download tagged version of tt-rss sources
+RUN mkdir -p /download/ttrss \
+  && curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /download/ttrss --strip-components 1
+
+# download some themes
+RUN mkdir -p /download/feedly-theme \
+  && curl -SL https://github.com/levito/tt-rss-feedly-theme/archive/v$FEEDLY_GIT_TAG.tar.gz | tar xzC /download/feedly-theme --strip-components 1
+
+
+FROM ubuntu:18.04
+MAINTAINER Hanjo Meinhardt <hanjo@bunix.de>
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
   nginx \
   supervisor \
   php7.2-fpm \
@@ -16,38 +32,27 @@ RUN apt-get update && apt-get install -y \
   php7.2-intl \
   php7.2-mbstring \
   php7.2-xml \
-  curl \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# enable the mcrypt module
-#RUN php7enmod mcrypt
-
 # add ttrss as the only nginx site
 ADD ttrss.nginx.conf /etc/nginx/sites-available/ttrss
-RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss
-RUN rm /etc/nginx/sites-enabled/default
+RUN ln -s /etc/nginx/sites-available/ttrss /etc/nginx/sites-enabled/ttrss \
+  && rm /etc/nginx/sites-enabled/default
 
 # install ttrss and patch configuration
 WORKDIR /var/www
 
-#RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-#    && apt-get purge -y --auto-remove curl \
+# copy the ttrss sources
+COPY --from=builder /download/ttrss ./
 
-RUN curl -SL https://git.tt-rss.org/git/tt-rss/archive/$TTRSS_GIT_TAG.tar.gz | tar xzC /var/www --strip-components 1 \
-    && cp config.php-dist config.php \
-    && chown www-data:www-data -R /var/www \
-    && mkdir /var/run/php
+# copy the feedly theme files
+COPY --from=builder /download/feedly-theme/feedly ./themes.local/feedly/
+COPY --from=builder /download/feedly-theme/feedly*.css ./themes.local/
 
-# expose only nginx HTTP port
-EXPOSE 80
-
-# complete path to ttrss
-ENV SELF_URL_PATH http://localhost
-
-# expose default database credentials via ENV in order to ease overwriting
-ENV DB_NAME ttrss
-ENV DB_USER ttrss
-ENV DB_PASS ttrss
+# prepare the runtime environment
+RUN cp config.php-dist config.php \
+    && chown www-data:www-data -R /var/www \
+    && mkdir -p /var/run/php
 
 # always re-configure database with current ENV when RUNning container, then monitor all services
 ADD configure-db.php /configure-db.php

supervisord.conf

@@ -1,15 +1,21 @@
 [supervisord]
 nodaemon=true
+logfile=/var/log/supervisord.log
+pidfile=/var/run/supervisord.pid
 
 [program:php-fpm7.2]
 command=/usr/sbin/php-fpm7.2 --nodaemonize
+stdout_logfile=/var/log/%(program_name)s.stdout
+stderr_logfile=/var/log/%(program_name)s.stderr
 
 [program:nginx]
 command=/usr/sbin/nginx -g "daemon off;"
+stdout_logfile=/var/log/%(program_name)s.stdout
+stderr_logfile=/var/log/%(program_name)s.stderr
 
 [program:ttrss-update-daemon]
 command=/usr/bin/php /var/www/update_daemon2.php
 user=www-data
-stdout_logfile=/tmp/%(program_name)s.stdout
-stderr_logfile=/tmp/%(program_name)s.stderr
+stdout_logfile=/var/log/%(program_name)s.stdout
+stderr_logfile=/var/log/%(program_name)s.stderr
 

ttrss.nginx.conf

@@ -8,9 +8,20 @@ server {
 		try_files $uri $uri/ =404;
 	}
 
+	location ~ \.php$ {
+		fastcgi_split_path_info ^(.*\.php)(/.*)?$;
+		fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
+		fastcgi_index index.php;
+		include fastcgi_params;
+		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+		fastcgi_intercept_errors off;
+		fastcgi_buffer_size 16k;
+		fastcgi_buffers 4 16k;
+	}
+
 	location ~ \.php$ {
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
-		fastcgi_pass unix:/var/run/php5-fpm.sock;
+		fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
 		fastcgi_index index.php;
 		include fastcgi_params;
 	}