From fad0d78718bfdacbb46c0f6d697f2b143fba9378 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Sat, 25 Jul 2026 14:36:50 +0300
Subject: [PATCH] =?UTF-8?q?transcriber:=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B9=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20=D0=BB=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D1=81=D0=B1=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BA=D1=83=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20Yandex=20Registry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- плейбук зовёт роль app_image, docker_login убран
- compose тянет `transcriber:{{ app_image_tag }}` с pull_policy: never
- удалены playbook-transcriber-registry.yml и vars/transcriber.images.yml
  с зашитым тегом образа
---
 files/transcriber/docker-compose.template.yml |  7 ++++++-
 playbook-transcriber-registry.yml             | 19 ------------------
 playbook-transcriber.yml                      | 20 +++++++++----------
 vars/transcriber.images.yml                   |  2 --
 vars/transcriber.yml                          |  5 -----
 5 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 playbook-transcriber-registry.yml
 delete mode 100644 vars/transcriber.images.yml

diff --git a/files/transcriber/docker-compose.template.yml b/files/transcriber/docker-compose.template.yml
index 1c0a1d3..0de745f 100644
--- a/files/transcriber/docker-compose.template.yml
+++ b/files/transcriber/docker-compose.template.yml
@@ -1,11 +1,16 @@
+# Образ собирается локально и доставляется на сервер ролью app_image
+# (см. playbook-transcriber.yml): тег — случайный BUILD_ID каждого прогона,
+# в реестре образа нет, поэтому pull_policy: never.
+
 services:
 
   transcriber_app:
     # noinspection ComposeUnknownValues
-    image: "{{ registry_transcriber_image }}"
+    image: "{{ app_name }}:{{ app_image_tag }}"
     container_name: transcriber_app
     user: "{{ owner_create_result.uid }}:{{ owner_create_result.group }}"
     restart: unless-stopped
+    pull_policy: never
     volumes:
       - "{{ config_file }}:/config/config.toml:ro"
       - "{{ data_dir }}:/data"
diff --git a/playbook-transcriber-registry.yml b/playbook-transcriber-registry.yml
deleted file mode 100644
index 9b291ae..0000000
--- a/playbook-transcriber-registry.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Upload local transcriber images to registry"
-  hosts: all
-  gather_facts: false
-
-  vars_files:
-    - vars/transcriber.yml
-    - vars/transcriber.images.yml
-
-  tasks:
-
-    - name: "Push web service image to remote registry"
-      community.docker.docker_image:
-        state: present
-        source: local
-        name: "{{ transcriber_image }}"
-        repository: "{{ registry_transcriber_image }}"
-        push: true
-      delegate_to: 127.0.0.1
diff --git a/playbook-transcriber.yml b/playbook-transcriber.yml
index 4791eaa..9e75c1b 100644
--- a/playbook-transcriber.yml
+++ b/playbook-transcriber.yml
@@ -4,9 +4,18 @@
 
   vars_files:
     - vars/transcriber.yml
-    - vars/transcriber.images.yml
 
   tasks:
+    # Образ собирается на control-хосте самим репозиторием transcriber (контракт —
+    # `task image`) и едет на сервер через docker save/load, без реестра.
+    # Роль выставляет факт app_image_tag — его подхватывает docker-compose.
+    - name: "Build and deliver application image"
+      ansible.builtin.import_role:
+        name: "app_image"
+      vars:
+        app_image_name: "{{ app_name }}"
+        app_image_src_dir: '{{ (playbook_dir, "..", "transcriber") | path_join }}'
+
     - name: "Create user and environment"
       ansible.builtin.import_role:
         name: owner
@@ -40,15 +49,6 @@
       # --diff покажет содержимое открытым текстом.
       no_log: true
 
-    - name: "Login to Yandex Container Registry"
-      community.docker.docker_login:
-        registry_url: "{{ yc_container_registry }}"
-        username: "oauth"
-        password: "{{ yc_oauth_token }}"
-      # Токен — аргумент модуля: по умолчанию не печатается, но всплывает
-      # при -v и в отчёте о падении задачи.
-      no_log: true
-
     - name: "Copy docker compose file"
       ansible.builtin.template:
         src: "./files/{{ app_name }}/docker-compose.template.yml"
diff --git a/vars/transcriber.images.yml b/vars/transcriber.images.yml
deleted file mode 100644
index 21d3748..0000000
--- a/vars/transcriber.images.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-transcriber_image: "transcriber:2fc5a56-1761210134"
diff --git a/vars/transcriber.yml b/vars/transcriber.yml
index daa4f30..2a3070f 100644
--- a/vars/transcriber.yml
+++ b/vars/transcriber.yml
@@ -10,8 +10,3 @@ config_file: "{{ (config_dir, 'config.toml') | path_join }}"
 
 data_dir: "{{ (base_dir, 'data') | path_join }}"
 backups_dir: "{{ (base_dir, 'backups') | path_join }}"
-
-docker_registry_prefix: "cr.yandex/crplfk0168i4o8kd7ade"
-
-# Registry images
-registry_transcriber_image: "{{ (docker_registry_prefix, transcriber_image) | path_join }}"