Explorar el Código

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
Alexandre Alapetite hace 1 año
padre
commit
68497030f9

+ 0 - 3
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

+ 0 - 3
Docker/freshrss/docker-compose-development.yml

@@ -1,7 +1,4 @@
-version: "2.4"
-
 services:
-
   freshrss:
     volumes:
       - ../..:/var/www/FreshRSS

+ 0 - 3
Docker/freshrss/docker-compose-local.yml

@@ -1,7 +1,4 @@
-version: "2.4"
-
 services:
-
   freshrss:
     ports:
       - "${PUBLISHED_PORT:-8080}:${LISTEN:-80}"

+ 2 - 4
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`)

+ 5 - 8
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