Commit Graph

8 Commits

Author SHA1 Message Date
caminsha
1f7bd93c5f Use environment variables (#3756)
* Add .env file for docker-compose (fix #3755)

Adding a .env has the advantage that the configuration can be stored in a separate file and it'll be possible to just get the newest docker-compose.yml file.

* Update documentation for the .env file

* Update Docker/README.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
2021-08-14 12:24:38 +02:00
Alexandre Alapetite
8dfe209799 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
2021-01-11 22:36:50 +01:00
Germs2004
20d0f9cd76 volume names include redundant prefix (#3108)
This proposed change includes tweaks to the names of the services and volumes, and adds an explicit label to the postgres and freshrss containers.

Using a more generic "freshrss-db" instead of "freshrss_postgresql" seems more standard among other docker projects and makes it a bit easier to switch databases later.

Removing the "freshrss_" prefix from the volume names solves a problem where the docker-compose automatically prepends a "project name" to volume names upon running "up".  So if your docker-compose.yml file is stored in a folder named "freshrss", you would end up with a redundant volume name of "freshrss_freshrss_data".

This also adds a restart policy to the db container.
2020-08-29 12:16:03 +02:00
Mike Vanbuskirk
65b55d2d58 fixes #2931 (#2970) 2020-05-14 08:39:09 +02:00
Alexandre Alapetite
cd49e9819b New core-extensions to allow Docker volumes for third-party extensions (#2837)
* New core-extensions to allow Docker volumes for third-party extensions

#Fix https://github.com/FreshRSS/FreshRSS/issues/2650
Split our extensions directory into two:
1) Core extensions shipped with FreshRSS in ./lib/core-extensions/
2) Third-party extensions modified by end-users in ./extensions/ which
can easily be mounted as a Docker volume

* Example of Docker Compose with extensions

* Back-compatibility + fix array merge bug
2020-03-22 16:31:20 +01:00
Alexandre Alapetite
0d5c80b698 Example Docker Compose v3 (#2553)
Fix https://github.com/FreshRSS/FreshRSS/issues/2547
2019-10-05 15:48:38 +02:00
Upils
66ff16294a Correct docker-compose.yml file and add a corresponding note in the doc. (#1906)
* Add a docker compose example.

Using postgresql and with traefik specific labels.

* Added docker-compose specific documentation.

* Move docker-compose section at the end of the README.md.

* Correct docker-compose.yml file and add a corresponding note in the doc.

* Typo in doc.
2018-05-29 22:28:30 +02:00
Upils
0ccda74571 Add a docker compose example. (#1882)
* Add a docker compose example.

Using postgresql and with traefik specific labels.

* Added docker-compose specific documentation.

* Move docker-compose section at the end of the README.md.
2018-05-09 09:57:46 +02:00