diff --git a/ansible/roles/core-net/remnawave/tasks/main.yml b/ansible/roles/core-net/remnawave/tasks/main.yml index f87fbd9..7b9cff5 100644 --- a/ansible/roles/core-net/remnawave/tasks/main.yml +++ b/ansible/roles/core-net/remnawave/tasks/main.yml @@ -130,6 +130,14 @@ group: root mode: "0644" +- name: Стянуть образы панели Remnawave + ansible.builtin.command: docker compose -f {{ remnawave_dir }}/compose.yaml pull + register: remnawave_compose_pull + changed_when: remnawave_compose_pull.rc == 0 + retries: 3 + delay: 10 + until: remnawave_compose_pull.rc == 0 + - name: Запустить панель Remnawave ansible.builtin.command: docker compose -f {{ remnawave_dir }}/compose.yaml up -d --remove-orphans register: remnawave_compose_up diff --git a/ansible/roles/core-net/remnawave/templates/compose.yaml.j2 b/ansible/roles/core-net/remnawave/templates/compose.yaml.j2 index 4214c03..8b17068 100644 --- a/ansible/roles/core-net/remnawave/templates/compose.yaml.j2 +++ b/ansible/roles/core-net/remnawave/templates/compose.yaml.j2 @@ -1,12 +1,5 @@ -x-common: &common - ulimits: - nofile: - soft: 1048576 - hard: 1048576 - restart: always - networks: - - remnawave-network - +# Без ulimits nofile: на unprivileged LXC (core-net) rlimit 1048576 даёт +# "error setting rlimit type 7: operation not permitted". x-logging: &logging logging: driver: json-file @@ -14,15 +7,16 @@ x-logging: &logging max-size: 100m max-file: 5 -x-env: &env - env_file: .env - services: remnawave: image: {{ remnawave_backend_image }} container_name: remnawave hostname: remnawave - <<: [*common, *logging, *env] + restart: always + env_file: .env + <<: *logging + networks: + - remnawave-network volumes: - valkey-socket:/var/run/valkey ports: @@ -45,7 +39,11 @@ services: container_name: remnawave-db hostname: remnawave-db shm_size: 512mb - <<: [*common, *logging, *env] + restart: always + env_file: .env + <<: *logging + networks: + - remnawave-network environment: - POSTGRES_USER=${POSTGRES_USER} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} @@ -65,7 +63,10 @@ services: image: {{ remnawave_redis_image }} container_name: remnawave-redis hostname: remnawave-redis - <<: [*common, *logging] + restart: always + <<: *logging + networks: + - remnawave-network volumes: - valkey-socket:/var/run/valkey command: >