diff options
Diffstat (limited to 'stacks/news/compose.yml')
| -rw-r--r-- | stacks/news/compose.yml | 42 |
1 files changed, 10 insertions, 32 deletions
diff --git a/stacks/news/compose.yml b/stacks/news/compose.yml index e9963f5..65a7847 100644 --- a/stacks/news/compose.yml +++ b/stacks/news/compose.yml @@ -1,39 +1,30 @@ ## Template compose used for each stack. -name: ${_STACK_0} # Explicit project name (do not rely on directory name) +name: ${STACK} # Explicit project name (do not rely on directory name) networks: edge-net: - name: ${_NET_0} - external: true # All networks SHOULD be external in production. + name: ${EDGE_NET} + external: true # All networks MUST be external in production. db-net: - name: ${_NET_1} - -volumes: - rss-data: - name: ${VOLUME_0} + name: ${DB_NET} external: true - rss-db: - name: ${_VOLUME_1} - external: true # All volumes SHOULD be external in production. services: - rss: - container_name: ${_CONTAINER_0} # Name the containers explicitly. + news-test: + container_name: ${NEWS_CONTAINER} # Explicitly name containers. image: freshrss/freshrss:latest restart: unless-stopped env_file: # NOTE: .compose.env WILL override .env if there are overlapping values. - - .run.env # Runtime ENV - - .env # Compose ENV - volumes: - - rss-data:/var/www/FreshRSS/data - extra_hosts: - - "${OIDC_PROVIDER_DOMAIN}:${PROXY_IP}" + - .run.env # Compose wiring defaults go here + - .env # Service env vars networks: - edge-net - db-net expose: - 80 + extra_hosts: + - "${OIDC_PROVIDER_DOMAIN}:${PROXY_IP}" # This is required so the container can return the right uri after auth. healthcheck: test: ["CMD", "cli/health.php"] timeout: 10s @@ -41,16 +32,3 @@ services: start_interval: 11s interval: 75s retries: 3 - rss-db: - container_name: ${_CONTAINER_1} # Name the containers explicitly. - image: postgres:18 - restart: unless-stopped - env_file: - - run.env # Runtime ENV - - .env # Compose ENV - volumes: - - rss-db:/var/lib/postgresql - networks: - - db-net - expose: - - 5432 |