Merge remote-tracking branch 'origin/static-dockerhub' into static-dockerhub-fox

docker-compose.yml

@@ -61,6 +61,7 @@ services:
       - OWNER_GID=${OWNER_GID}
     volumes:
       - backups:/backups
+      - app:/var/www/html
     depends_on:
       - db
     command: /dcron.sh -f

src/app/Dockerfile

@@ -13,7 +13,7 @@ ADD updater.sh /
 ADD index.php /
 ADD build-prepare.sh /
 ADD dcron.sh /
-ADD backup-database.sh /etc/periodic/weekly/backup-database
+ADD backup.sh /etc/periodic/weekly/backup
 
 RUN sed -i.bak 's/^listen = 127.0.0.1:9000/listen = 9000/' /etc/php7/php-fpm.d/www.conf
 RUN sed -i.bak 's/\(memory_limit =\) 128M/\1 256M/' /etc/php7/php.ini

src/app/backup.sh

@@ -2,6 +2,7 @@
 
 DST_DIR=/backups
 KEEP_DAYS=28
+APP_ROOT=/var/www/html/tt-rss
 
 if pg_isready -h $DB_HOST -U $DB_USER; then
 	DST_FILE=ttrss-backup-$(date +%Y%m%d).sql.gz
@@ -12,9 +13,17 @@ if pg_isready -h $DB_HOST -U $DB_USER; then
 
 	pg_dump --clean -h $DB_HOST -U $DB_USER $DB_NAME | gzip > $DST_DIR/$DST_FILE
 
+	DST_FILE=ttrss-backup-$(date +%Y%m%d).tar.gz
+
+	echo backing up tt-rss local directories to $DST_DIR/$DST_FILE...
+
+	tar -cz -f $DST_DIR/$DST_FILE $APP_ROOT/*.local \
+		$APP_ROOT/feed-icons/ \
+		$APP_ROOT/config.php
+
 	echo cleaning up...
 
-	find $DST_DIR -type f -name '*.sql.gz' -mtime +$KEEP_DAYS -delete
+	find $DST_DIR -type f -name '*.gz' -mtime +$KEEP_DAYS -delete
 
 	echo done.
 else

src/docker-compose.yml

@@ -73,6 +73,7 @@ services:
       - OWNER_GID=${OWNER_GID}
     volumes:
       - backups:/backups
+      - app:/var/www/html
     depends_on:
       - db
     command: /dcron.sh -f