Merge branch 'master' of milkman671/ttrss-docker-compose into master

app/Dockerfile

@@ -5,11 +5,11 @@ RUN apk add --no-cache php7 php7-fpm \
 	php7-pdo php7-gd php7-pgsql php7-pdo_pgsql php7-mbstring \
 	php7-intl php7-xml php7-curl php7-session \
 	php7-dom php7-fileinfo php7-json \
-	git postgresql-client dcron sudo
+	php7-pcntl php7-posix \
+	git postgresql-client sudo
 
 ADD startup.sh /
 ADD index.php /
-ADD scripts/update /etc/periodic/15min/
 
 RUN sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf
 

app/scripts/update

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-DST_DIR=/var/www/html/tt-rss
-
-if [ -s $DST_DIR/config.php ]; then
-	sudo -u nobody $DST_DIR/update.php --feeds
-fi

app/startup.sh

@@ -32,7 +32,6 @@ else
 fi
 
 chown -R $OWNER_UID:$OWNER_GID $DST_DIR
-chmod +x /etc/periodic/15min/*
 
 for d in cache lock feed-icons; do
 	chmod -R 777 $DST_DIR/$d
@@ -69,7 +68,5 @@ else
 		-i.bak $DST_DIR/config.php
 fi
 
-crond &
-
 exec /usr/sbin/php-fpm7 -F
 

docker-compose.yml

@@ -35,6 +35,21 @@ services:
     depends_on:
       - db
 
+  updater:
+    build:
+      context:
+        ./app
+      args:
+        - OWNER_UID=${OWNER_UID}
+        - OWNER_GID=${OWNER_GID}
+    restart: unless-stopped
+    volumes:
+      - app:/var/www/html
+    depends_on:
+      - app
+    user: app
+    command: "php /var/www/html/tt-rss/update_daemon2.php"
+
   web:
     build: ./web
     restart: unless-stopped