fix: properly connect services in a stack
This commit is contained in:
parent
db40656843
commit
324fa8425c
2 changed files with 19 additions and 16 deletions
|
|
@ -9,6 +9,8 @@ export ANSIBLE_DISPLAY_ARGS_TO_STDOUT := if env('CI', '') == 'true' { 'false' }
|
||||||
play +ARGS:
|
play +ARGS:
|
||||||
uv run ansible-playbook {{ ARGS }}
|
uv run ansible-playbook {{ ARGS }}
|
||||||
|
|
||||||
|
deploy-services: (play "./playbooks/docker/services.yaml")
|
||||||
|
|
||||||
ansible +ARGS:
|
ansible +ARGS:
|
||||||
uv run ansible {{ ARGS }}
|
uv run ansible {{ ARGS }}
|
||||||
|
|
||||||
|
|
@ -21,5 +23,8 @@ encrypt +ARGS:
|
||||||
encrypt-var NAME +CONTENT='':
|
encrypt-var NAME +CONTENT='':
|
||||||
uv run ansible-vault encrypt_string {{ if CONTENT != "" {"--name"} else {"--stdin-name"} }} {{ NAME }} {{ CONTENT }}
|
uv run ansible-vault encrypt_string {{ if CONTENT != "" {"--name"} else {"--stdin-name"} }} {{ NAME }} {{ CONTENT }}
|
||||||
|
|
||||||
|
decrypt-var FILE NAME:
|
||||||
|
uv run ansible localhost -m ansible.builtin.debug -e "@{{ FILE }}" -a var="{{ NAME }}"
|
||||||
|
|
||||||
decrypt +ARGS:
|
decrypt +ARGS:
|
||||||
uv run ansible-vault edit {{ ARGS }}
|
uv run ansible-vault edit {{ ARGS }}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
networks:
|
networks:
|
||||||
reverse-proxy:
|
reverse_proxy:
|
||||||
external: true
|
external: true
|
||||||
miniflux:
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
linkding_data:
|
linkding_data:
|
||||||
|
|
@ -11,16 +10,16 @@ services:
|
||||||
miniflux:
|
miniflux:
|
||||||
image: miniflux/miniflux:latest
|
image: miniflux/miniflux:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
|
||||||
- miniflux_db
|
|
||||||
networks:
|
networks:
|
||||||
- miniflux
|
- default
|
||||||
- reverse-proxy
|
- reverse_proxy
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgres://${MF_DB_USER}:${MF_DB_PASS}@miniflux_db/miniflux?sslmode=disable
|
DATABASE_URL: "user=${MF_DB_USER} password=${MF_DB_PASS} dbname=miniflux host=tasks.miniflux_db sslmode=disable"
|
||||||
RUN_MIGRATIONS: 1
|
RUN_MIGRATIONS: 1
|
||||||
BASE_URL: https://rss.alecodes.page
|
BASE_URL: https://rss.alecodes.page
|
||||||
|
|
||||||
|
LOG_LEVEL: debug
|
||||||
|
|
||||||
OIDC_ENABLED: 1
|
OIDC_ENABLED: 1
|
||||||
DISABLE_LOCAL_AUTH: 1
|
DISABLE_LOCAL_AUTH: 1
|
||||||
OAUTH2_USER_CREATION: 1
|
OAUTH2_USER_CREATION: 1
|
||||||
|
|
@ -42,17 +41,15 @@ services:
|
||||||
- node.labels.services_kind==${SERVICE_KIND:-common}
|
- node.labels.services_kind==${SERVICE_KIND:-common}
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.http.routers.freshrss.rule=Host(`rss.alecodes.page`)
|
- traefik.http.routers.miniflux.rule=Host(`rss.alecodes.page`)
|
||||||
- traefik.http.services.freshrss.loadbalancer.server.port=8080
|
- traefik.http.services.miniflux.loadbalancer.server.port=8080
|
||||||
|
|
||||||
miniflux_db:
|
miniflux_db:
|
||||||
image: postgres:15
|
image: postgres:latest
|
||||||
networks:
|
|
||||||
- miniflux
|
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=${MF_DB_USER}
|
POSTGRES_USER: ${MF_DB_USER}
|
||||||
- POSTGRES_PASSWORD=${MF_DB_PASS}
|
POSTGRES_PASSWORD: ${MF_DB_PASS}
|
||||||
- POSTGRES_DB=miniflux
|
POSTGRES_DB: miniflux
|
||||||
volumes:
|
volumes:
|
||||||
- miniflux_db:/var/lib/postgresql/data
|
- miniflux_db:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
|
@ -74,7 +71,8 @@ services:
|
||||||
image: sissbruecker/linkding:latest
|
image: sissbruecker/linkding:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- reverse-proxy
|
- default
|
||||||
|
- reverse_proxy
|
||||||
volumes:
|
volumes:
|
||||||
- linkding_data:/etc/linkding/data"
|
- linkding_data:/etc/linkding/data"
|
||||||
environment:
|
environment:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue