diff options
| author | Alexandre Alapetite <alexandre@alapetite.fr> | 2025-01-25 09:13:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-25 09:13:44 +0100 |
| commit | 68497030f988cac483a67b27b96d2ac90a54856e (patch) | |
| tree | a4ec20641ada22797db22961db60aa84efc1f170 /Docker | |
| parent | 539d58b8fc7cb4c5e8fbf531ad2a711c383ffac0 (diff) | |
| download | freshrss-68497030f988cac483a67b27b96d2ac90a54856e.tar.gz freshrss-68497030f988cac483a67b27b96d2ac90a54856e.zip | |
Ligth update Docker Compose (#7249)
I just saw some users getting confused about the build section despite of the comment, so commented out by default
https://github.com/FreshRSS/FreshRSS/discussions/7246#discussioncomment-11908948
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/freshrss/docker-compose-db.yml | 3 | ||||
| -rw-r--r-- | Docker/freshrss/docker-compose-development.yml | 3 | ||||
| -rw-r--r-- | Docker/freshrss/docker-compose-local.yml | 3 | ||||
| -rw-r--r-- | Docker/freshrss/docker-compose-proxy.yml | 6 | ||||
| -rw-r--r-- | Docker/freshrss/docker-compose.yml | 13 |
5 files changed, 7 insertions, 21 deletions
diff --git a/Docker/freshrss/docker-compose-db.yml b/Docker/freshrss/docker-compose-db.yml index 6d895b3fb..6b09f57c5 100644 --- a/Docker/freshrss/docker-compose-db.yml +++ b/Docker/freshrss/docker-compose-db.yml @@ -1,10 +1,7 @@ -version: "2.4" - volumes: db: services: - freshrss-db: image: postgres:17 container_name: freshrss-db diff --git a/Docker/freshrss/docker-compose-development.yml b/Docker/freshrss/docker-compose-development.yml index db0bbc099..ecba87f6e 100644 --- a/Docker/freshrss/docker-compose-development.yml +++ b/Docker/freshrss/docker-compose-development.yml @@ -1,7 +1,4 @@ -version: "2.4" - services: - freshrss: volumes: - ../..:/var/www/FreshRSS diff --git a/Docker/freshrss/docker-compose-local.yml b/Docker/freshrss/docker-compose-local.yml index 989c3c617..0ed3e271e 100644 --- a/Docker/freshrss/docker-compose-local.yml +++ b/Docker/freshrss/docker-compose-local.yml @@ -1,7 +1,4 @@ -version: "2.4" - services: - freshrss: ports: - "${PUBLISHED_PORT:-8080}:${LISTEN:-80}" diff --git a/Docker/freshrss/docker-compose-proxy.yml b/Docker/freshrss/docker-compose-proxy.yml index a9b9e375a..46a478796 100644 --- a/Docker/freshrss/docker-compose-proxy.yml +++ b/Docker/freshrss/docker-compose-proxy.yml @@ -1,5 +1,3 @@ -version: "2.4" - volumes: traefik-letsencrypt: traefik-tmp: @@ -53,10 +51,10 @@ services: - traefik.http.routers.freshrss.entryPoints=https - traefik.http.routers.freshrss.tls.certResolver=letsEncrypt - traefik.http.routers.freshrss.tls=true - ## Option 1: server FreshRSS as sub-domain + # Option 1: server FreshRSS as sub-domain - traefik.http.routers.freshrss.middlewares=freshrssM1,freshrssM2 - traefik.http.routers.freshrss.rule=Host(`${SERVER_DNS}`) - ## Option 2: serve FreshRSS as sub-path + # # Option 2: serve FreshRSS as sub-path # - traefik.http.middlewares.freshrssM3.stripprefix.prefixes=/freshrss # - traefik.http.routers.freshrss.middlewares=freshrssM1,freshrssM2,freshrssM3 # - traefik.http.routers.freshrss.rule=PathPrefix(`/freshrss`) diff --git a/Docker/freshrss/docker-compose.yml b/Docker/freshrss/docker-compose.yml index 7eb23fe9c..e1f66179b 100644 --- a/Docker/freshrss/docker-compose.yml +++ b/Docker/freshrss/docker-compose.yml @@ -1,18 +1,15 @@ -version: "2.4" - volumes: data: extensions: services: - freshrss: image: freshrss/freshrss:latest - # Optional build section if you want to build the image locally: - build: - # Pick #latest (stable release) or #edge (rolling release) or a specific release like #1.21.0 - context: https://github.com/FreshRSS/FreshRSS.git#latest - dockerfile: Docker/Dockerfile-Alpine + # # Optional build section if you want to build the image locally: + # build: + # # Pick #latest (slow releases) or #edge (rolling release) or a specific release like #1.21.0 + # context: https://github.com/FreshRSS/FreshRSS.git#latest + # dockerfile: Docker/Dockerfile-Alpine container_name: freshrss hostname: freshrss restart: unless-stopped |