aboutsummaryrefslogtreecommitdiff
path: root/Docker/docker-compose.yml
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2021-01-11 22:36:50 +0100
committerGravatar GitHub <noreply@github.com> 2021-01-11 22:36:50 +0100
commit8dfe2097992307b572b42647b53a76dd5d93aaa9 (patch)
tree5c5cecd7437ee584cc540a98f5597196f74fa4de /Docker/docker-compose.yml
parentfd8258775643eb0d898679f210c00de07c79eadc (diff)
Possiblity to autoinstall in Docker Compose (#3353)
* Possiblity to autoinstall in Docker Compose #fix https://github.com/FreshRSS/FreshRSS/issues/3349 It is simply calling our existing CLI: do-install.php and create-user.php https://github.com/FreshRSS/FreshRSS/tree/master/cli FreshRSS will typically be ready a few seconds before the database, so introduce a tolerance when the database is not available / up (yet) by trying a few times to connect. Also useful to avoid service interruption when DB service is restarted. Example: ```yml freshrss-app: image: freshrss/freshrss container_name: freshrss-app hostname: freshrss-app restart: unless-stopped ports: - "8080:80" depends_on: - freshrss-db volumes: - data:/var/www/FreshRSS/data - extensions:/var/www/FreshRSS/extensions environment: CRON_MIN: '*/20' FRESHRSS_ENV: development FRESHRSS_INSTALL: |- --api_enabled --base_url https://rss.example.net --db-base freshrss --db-host freshrss-db --db-password freshrss --db-type pgsql --db-user freshrss --default_user admin --language en FRESHRSS_USER: |- --api_password freshrss --email user@example.net --language en --password freshrss --user admin TZ: Europe/Paris ``` * Minor type f in find * shellcheck
Diffstat (limited to 'Docker/docker-compose.yml')
-rw-r--r--Docker/docker-compose.yml12
1 files changed, 5 insertions, 7 deletions
diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
index e478f404e..8fcc6f6d6 100644
--- a/Docker/docker-compose.yml
+++ b/Docker/docker-compose.yml
@@ -9,9 +9,9 @@ services:
volumes:
- db:/var/lib/postgresql/data
environment:
- - POSTGRES_USER=freshrss
- - POSTGRES_PASSWORD=freshrss
- - POSTGRES_DB=freshrss
+ POSTGRES_USER: freshrss
+ POSTGRES_PASSWORD: freshrss
+ POSTGRES_DB: freshrss
freshrss-app:
image: freshrss/freshrss:latest
@@ -26,10 +26,8 @@ services:
- data:/var/www/FreshRSS/data
- extensions:/var/www/FreshRSS/extensions
environment:
- - CRON_MIN=*/20
- - TZ=Europe/Copenhagen
- labels:
- - "traefik.port=80"
+ CRON_MIN: '*/20'
+ TZ: Europe/Paris
volumes:
db: