From 1133660b9fd93cbe9cb98c15f6b628d89402d02f Mon Sep 17 00:00:00 2001
From: Mathieu Bruyen <code@mais-h.eu>
Date: Sun, 26 Jan 2020 17:31:14 +0100
Subject: [PATCH] upgrade ttrss to latest

---
 Dockerfile | 13 +++++++------
 Readme.md  |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4eab1cb..d28fd6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.17.3-alpine
+FROM nginx:1.17.8-alpine
 
 RUN \
   apk add --no-cache \
@@ -21,23 +21,24 @@ RUN \
     php7-mbstring \
     php7-json \
     php7-fileinfo \
+    git \
     tar
 
 EXPOSE 80 443
 
+RUN \
+    git clone https://git.tt-rss.org/fox/tt-rss.git /var/lib/tt-rss && \
+    cd /var/lib/tt-rss && \
+    git checkout 076c5382fafcaf5ffd2bd41752e8e3c3b20e6af0
+
 WORKDIR /app
 COPY CHECKS /app/CHECKS
 
-ADD https://git.tt-rss.org/fox/tt-rss/archive/19.8.tar.gz /tmp/ttrss.tar.gz
-
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY php-fpm.conf /etc/php7/php-fpm.d/ttrss.conf
 COPY install-db.php /var/lib/tt-rss-install/install-db.php
 COPY supervisor.conf /var/lib/tt-rss-install/supervisor.conf
 COPY manage-supervisord.py /var/lib/tt-rss-install/manage-supervisord.py
-
-RUN tar -xzf /tmp/ttrss.tar.gz -C /var/lib
-
 COPY config.php /var/lib/tt-rss/config.php
 
 RUN \
diff --git a/Readme.md b/Readme.md
index c24d734..a3ab108 100644
--- a/Readme.md
+++ b/Readme.md
@@ -45,8 +45,8 @@ dokku letsencrypt:auto-renew ttrss
 ### TTRSS
 
 * Upgrade base image in `Dockerfile`: https://hub.docker.com/_/nginx?tab=tags
-* Upgrade TTRSS release in `Dockerfile`
-* Propagate updates in `config.php-dist` to `config.php`: https://git.tt-rss.org/fox/tt-rss/src/19.8/config.php-dist
+* Upgrade TTRSS commit in `Dockerfile`
+* Propagate updates in `config.php-dist` to `config.php`: https://git.tt-rss.org/fox/tt-rss/src/master/config.php-dist
 
 ```bash
 dokku postgres:export ttrssdb_11_4 > ttrss.db