Update work with env variables

miniflux/docker-compose.yaml

@@ -9,15 +9,6 @@ services:
     networks:
       - proxy
       - miniflux
-    environment:
-      - DATABASE_URL=postgres://miniflux:${MINIFLUX_POSTGRES_PASSWORD}@miniflux-db/miniflux?sslmode=disable
-      - RUN_MIGRATIONS=1
-      - OAUTH2_PROVIDER=oidc
-      - OAUTH2_CLIENT_ID=${MINIFLUX_OAUTH2_CLIENT_ID}
-      - OAUTH2_CLIENT_SECRET=${MINIFLUX_OAUTH2_CLIENT_SECRET}
-      - OAUTH2_REDIRECT_URL=https://${MINIFLUX_HOST}/oauth2/oidc/callback
-      - OAUTH2_OIDC_DISCOVERY_ENDPOINT=https://${MINIFLUX_OAUTH2_OIDC_DISCOVERY_ENDPOINT}
-      - OAUTH2_USER_CREATION=1
     labels:
       - "traefik.enable=true"
       - "traefik.http.services.miniflux.loadbalancer.server.port=8080"
@@ -31,10 +22,6 @@ services:
     restart: unless-stopped
     networks:
       - miniflux
-    environment:
-      - POSTGRES_USER=miniflux
-      - POSTGRES_PASSWORD=${MINIFLUX_POSTGRES_PASSWORD}
-      - POSTGRES_DB=miniflux
     volumes:
       - ./data/miniflux-db:/var/lib/postgresql
     healthcheck:
@@ -48,4 +35,4 @@ networks:
     name: proxy
     external: true
   miniflux:
-    name: miniflux
+    name: miniflux

miniflux/env.example

@@ -1,5 +1,15 @@
 MINIFLUX_HOST=
-MINIFLUX_POSTGRES_PASSWORD=
-MINIFLUX_OAUTH2_CLIENT_ID=
-MINIFLUX_OAUTH2_CLIENT_SECRET=
-MINIFLUX_OAUTH2_OIDC_DISCOVERY_ENDPOINT=
+POSTGRES_PASSWORD=
+OAUTH2_CLIENT_ID=
+OAUTH2_CLIENT_SECRET=
+OAUTH2_OIDC_DISCOVERY_ENDPOINT=
+
+POSTGRES_USER=miniflux
+POSTGRES_DB=miniflux
+DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@miniflux-db/${POSTGRES_DB}?sslmode=disable
+
+RUN_MIGRATIONS=1
+
+OAUTH2_PROVIDER=oidc
+OAUTH2_REDIRECT_URL=https://${MINIFLUX_HOST}/oauth2/oidc/callback
+OAUTH2_USER_CREATION=1