diff --git a/group_vars/all.yml b/group_vars/all.yml index c6a4e2d..63f9c76 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -49,4 +49,6 @@ bookstack_port: "45131" # Mealie variables mealie_base_dir: "/mnt/mealie" mealie_data_dir: "/mnt/mealie/data" -mealie_port: "45132" \ No newline at end of file +mealie_port: "45132" +mealie_db_type: "postgres" # sqlite или postgres +mealie_db_password: "secure_password_123" \ No newline at end of file diff --git a/roles/mealie/templates/docker-compose.yml.j2 b/roles/mealie/templates/docker-compose.yml.j2 index eb182af..6584108 100644 --- a/roles/mealie/templates/docker-compose.yml.j2 +++ b/roles/mealie/templates/docker-compose.yml.j2 @@ -1,7 +1,7 @@ version: "3.8" -services: +services:services: mealie: - image: mealie/mealie:latest + image: hkotel/mealie:latest container_name: mealie restart: unless-stopped ports: @@ -13,7 +13,7 @@ services: - ALLOW_SIGNUP=true - DB_ENGINE=postgres - POSTGRES_USER=mealie - - POSTGRES_PASSWORD=mealie + - POSTGRES_PASSWORD={{ mealie_db_password }} - POSTGRES_SERVER=postgres - POSTGRES_PORT=5432 - POSTGRES_DB=mealie @@ -21,19 +21,14 @@ services: - {{ mealie_data_dir }}:/app/data depends_on: - postgres - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:80/api/app/about"] - interval: 30s - timeout: 10s - retries: 3 postgres: - image: postgres:13 + image: postgres:15 container_name: mealie-postgres restart: unless-stopped environment: - POSTGRES_USER=mealie - - POSTGRES_PASSWORD=mealie + - POSTGRES_PASSWORD={{ mealie_db_password }} - POSTGRES_DB=mealie volumes: - {{ mealie_data_dir }}/postgres:/var/lib/postgresql/data \ No newline at end of file