boyska/Feedati
Archived
2
0
Fork 0
forked from blallo/Feedati
Code Releases Activity

Merge da quell'antipatico di boyska che mi cambia tutte le porte

Browse source
This commit is contained in:
Blallo 2018-08-01 15:58:46 +02:00
commit 220508309e
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -15,5 +15,5 @@ build: fix-permissions
docker exec -t $$(docker ps -qf name=feedati_db) rm -f /tmp/ttrss.sql docker exec -t $$(docker ps -qf name=feedati_db) rm -f /tmp/ttrss.sql
docker-compose stop docker-compose stop
run: run: fix-permissions
docker-compose up docker-compose up

6
docker-compose.yml
View file

@ -19,7 +19,7 @@ services:
dockerfile: ./docker/Dockerfile-tt-rss dockerfile: ./docker/Dockerfile-tt-rss
volumes: volumes:
- ./tt-rss:/var/www/html/tt-rss - ./tt-rss:/var/www/html/tt-rss
- ./docker/config.php:/var/www/html/tt-rss/config.php:ro - ./docker/ttrss-config.php:/var/www/html/tt-rss/config.php:ro
ports: ports:
- 8000:80 - 8000:80
- 9312:9312 - 9312:9312
@ -30,11 +30,13 @@ services:
context: ./rss-bridge/ context: ./rss-bridge/
ports: ports:
- 8001:80 - 8001:80
environment:
- APACHE_SERVER_NAME=rss-bridge
webserver: webserver:
image: nginx:latest image: nginx:latest
volumes: volumes:
- ./docker/rss.conf:/etc/nginx/conf.d/default.conf:ro - ./docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
ports: ports:
- 80:80 - 80:80

0
docker/rss.conf → docker/nginx.conf
View file

0
docker/config.php → docker/ttrss-config.php
View file