add missing theme volume; add healthcheck
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Robert Kaussow 2019-07-16 22:24:03 +02:00
parent 3349acca0f
commit 8ebe3dbb20
4 changed files with 23 additions and 6 deletions

View File

@ -29,9 +29,11 @@ ADD overlay/ /
VOLUME /var/www/app/plugins.local
VOLUME /var/www/app/feed-icons
VOLUME /var/www/app/themes.local
EXPOSE 80
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
HEALTHCHECK --interval 30s --timeout 10s --retries 5 CMD wget --quiet --tries=1 --spider http://localhost
WORKDIR /var/www/app
CMD []

View File

@ -26,7 +26,7 @@ Compatible with docker-compose v2 schemas.
```Yaml
---
version: '2'
version: '2.1'
services:
ttrss:
@ -38,6 +38,7 @@ services:
volumes:
- plugins:/var/www/app/plugins.local
- icons:/var/www/app/feed-icons
- themes:/var/www/app/themes.local
db:
image: postgres
@ -55,6 +56,8 @@ volumes:
driver: local
icons:
driver: local
themes:
driver: local
```
## Environment variables

View File

@ -1,4 +1,4 @@
version: '2'
version: '2.1'
services:
ttrss:
@ -6,8 +6,12 @@ services:
ports:
- "80:80"
depends_on:
- db
- db
volumes:
- plugins:/var/www/app/plugins.local
- icons:/var/www/app/feed-icons
- themes:/var/www/app/themes.local
db:
image: postgres
environment:
@ -15,8 +19,14 @@ services:
POSTGRES_PASSWORD: secure
POSTGRES_DB: ttrss
volumes:
- postgres_data:/var/lib/postgresql/data
- postgres_data:/var/lib/postgresql/data
volumes:
postgres_data:
driver: local
plugins:
driver: local
icons:
driver: local
themes:
driver: local

View File

@ -5,7 +5,9 @@
chown -R nginx:nginx /var/www/app/lock
chown -R nginx:nginx /var/www/app/cache
chown -R nginx:nginx /var/www/app/feed-icons
chown -R nginx:nginx /var/www/app/plugins.local
chown -R nginx:nginx /var/www/app/themes.local
s6-setuidgid nginx php7 /var/www/app/docker_setup.php
s6-setuidgid nginx php /var/www/app/docker_setup.php
exec /bin/s6-svscan /etc/services.d