diff --git a/.gitea/docker/runner/Dockerfile b/.gitea/docker/runner/Dockerfile new file mode 100644 index 0000000..fed577e --- /dev/null +++ b/.gitea/docker/runner/Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu:24.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get install -y --no-install-recommends \ + git \ + openssh-client \ + ansible-core \ + python3 \ + sshpass \ + ca-certificates \ + curl \ + && ansible-galaxy collection install ansible.posix \ + && rm -rf /var/lib/apt/lists/* + diff --git a/.gitea/workflows/netbird-install.yml b/.gitea/workflows/netbird-install.yml index 01f3735..c6cdf1b 100644 --- a/.gitea/workflows/netbird-install.yml +++ b/.gitea/workflows/netbird-install.yml @@ -11,6 +11,8 @@ on: jobs: install: runs-on: homelab + container: + image: homelab-ansible:latest timeout-minutes: 30 steps: - name: Запустить плейбук NetBird @@ -28,14 +30,6 @@ jobs: exit 1 fi - if [ "$(id -u)" -eq 0 ]; then - apt-get update - apt-get install -y git openssh-client ansible-core python3 sshpass - else - sudo apt-get update - sudo apt-get install -y git openssh-client ansible-core python3 sshpass - fi - rm -rf "${HOME}/homelab-infra" git clone https://gitea.gunihome.ru/karpenok/homelab-infra.git "${HOME}/homelab-infra" sha="${GITHUB_SHA:-${GITEA_SHA:-}}" @@ -50,7 +44,6 @@ jobs: trap 'rm -f "${HOME}/.ssh/id_ed25519"' EXIT cd "${HOME}/homelab-infra" - ansible-galaxy collection install -r requirements.yml ansible-playbook playbooks/site.yml \ -i inventories/prod/hosts.yml \ diff --git a/roles/netbird/tasks/main.yml b/roles/netbird/tasks/main.yml index 11562a3..120b607 100644 --- a/roles/netbird/tasks/main.yml +++ b/roles/netbird/tasks/main.yml @@ -84,7 +84,8 @@ mode: "0600" no_log: true notify: Перезапустить NetBird - when: not netbird_env.stat.exists + tags: + - config - name: Положить манифест панели ansible.builtin.copy: