upgrade ttrss to latest

This commit is contained in:
2020-01-26 17:31:14 +01:00
parent 5260e94007
commit 1133660b9f
2 changed files with 9 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
FROM nginx:1.17.3-alpine FROM nginx:1.17.8-alpine
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
@@ -21,23 +21,24 @@ RUN \
php7-mbstring \ php7-mbstring \
php7-json \ php7-json \
php7-fileinfo \ php7-fileinfo \
git \
tar tar
EXPOSE 80 443 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 WORKDIR /app
COPY CHECKS /app/CHECKS 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 nginx.conf /etc/nginx/conf.d/default.conf
COPY php-fpm.conf /etc/php7/php-fpm.d/ttrss.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 install-db.php /var/lib/tt-rss-install/install-db.php
COPY supervisor.conf /var/lib/tt-rss-install/supervisor.conf COPY supervisor.conf /var/lib/tt-rss-install/supervisor.conf
COPY manage-supervisord.py /var/lib/tt-rss-install/manage-supervisord.py 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 COPY config.php /var/lib/tt-rss/config.php
RUN \ RUN \

View File

@@ -45,8 +45,8 @@ dokku letsencrypt:auto-renew ttrss
### TTRSS ### TTRSS
* Upgrade base image in `Dockerfile`: https://hub.docker.com/_/nginx?tab=tags * Upgrade base image in `Dockerfile`: https://hub.docker.com/_/nginx?tab=tags
* Upgrade TTRSS release in `Dockerfile` * Upgrade TTRSS commit 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 * Propagate updates in `config.php-dist` to `config.php`: https://git.tt-rss.org/fox/tt-rss/src/master/config.php-dist
```bash ```bash
dokku postgres:export ttrssdb_11_4 > ttrss.db dokku postgres:export ttrssdb_11_4 > ttrss.db