homepage: деплой через локальную сборку образа вместо Yandex Registry
- плейбук зовёт роль app_image, docker_login и `pull: always` убраны
- compose тянет `homepage-nginx:{{ app_image_tag }}` с pull_policy: never
- удалён playbook-homepage-registry.yml и registry-переменные из vars
This commit is contained in:
@@ -1,10 +1,15 @@
|
|||||||
|
# Образ собирается локально и доставляется на сервер ролью app_image
|
||||||
|
# (см. playbook-homepage.yml): тег — случайный BUILD_ID каждого прогона,
|
||||||
|
# в реестре образа нет, поэтому pull_policy: never.
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
homepage_app:
|
homepage_app:
|
||||||
# noinspection ComposeUnknownValues
|
# noinspection ComposeUnknownValues
|
||||||
image: "{{ registry_homepage_nginx_image }}"
|
image: "{{ homepage_image_name }}:{{ app_image_tag }}"
|
||||||
container_name: homepage_app
|
container_name: homepage_app
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
pull_policy: never
|
||||||
networks:
|
networks:
|
||||||
- "web_proxy_network"
|
- "web_proxy_network"
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
---
|
|
||||||
- name: "Upload local homepage images to registry"
|
|
||||||
hosts: all
|
|
||||||
gather_facts: false
|
|
||||||
|
|
||||||
vars_files:
|
|
||||||
- vars/homepage.yml
|
|
||||||
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: "Push web service image to remote registry"
|
|
||||||
community.docker.docker_image:
|
|
||||||
state: present
|
|
||||||
source: local
|
|
||||||
name: "{{ homepage_nginx_image }}"
|
|
||||||
repository: "{{ registry_homepage_nginx_image }}"
|
|
||||||
push: true
|
|
||||||
delegate_to: 127.0.0.1
|
|
||||||
+10
-10
@@ -6,6 +6,16 @@
|
|||||||
- vars/homepage.yml
|
- vars/homepage.yml
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
# Образ собирается на control-хосте самим репозиторием homepage (контракт —
|
||||||
|
# `task image`: сборка сайта astro + nginx-образ) и едет на сервер через
|
||||||
|
# docker save/load, без реестра. Роль выставляет факт app_image_tag.
|
||||||
|
- name: "Build and deliver application image"
|
||||||
|
ansible.builtin.import_role:
|
||||||
|
name: "app_image"
|
||||||
|
vars:
|
||||||
|
app_image_name: "{{ homepage_image_name }}"
|
||||||
|
app_image_src_dir: '{{ (playbook_dir, "..", "homepage") | path_join }}'
|
||||||
|
|
||||||
- name: "Create user and environment"
|
- name: "Create user and environment"
|
||||||
ansible.builtin.import_role:
|
ansible.builtin.import_role:
|
||||||
name: owner
|
name: owner
|
||||||
@@ -25,15 +35,6 @@
|
|||||||
loop:
|
loop:
|
||||||
- "{{ base_dir }}"
|
- "{{ base_dir }}"
|
||||||
|
|
||||||
- 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"
|
- name: "Copy docker compose file"
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "./files/{{ app_name }}/docker-compose.template.yml"
|
src: "./files/{{ app_name }}/docker-compose.template.yml"
|
||||||
@@ -47,6 +48,5 @@
|
|||||||
project_src: "{{ base_dir }}"
|
project_src: "{{ base_dir }}"
|
||||||
state: "present"
|
state: "present"
|
||||||
remove_orphans: true
|
remove_orphans: true
|
||||||
pull: "always"
|
|
||||||
tags:
|
tags:
|
||||||
- run-app
|
- run-app
|
||||||
|
|||||||
+3
-5
@@ -4,9 +4,7 @@ app_user: "{{ app_name }}"
|
|||||||
app_owner_uid: 1008
|
app_owner_uid: 1008
|
||||||
app_owner_gid: 1009
|
app_owner_gid: 1009
|
||||||
base_dir: "{{ (application_dir, app_name) | path_join }}"
|
base_dir: "{{ (application_dir, app_name) | path_join }}"
|
||||||
docker_registry_prefix: "cr.yandex/crplfk0168i4o8kd7ade"
|
|
||||||
|
|
||||||
homepage_nginx_image: "homepage-nginx:latest"
|
# Имя локально собираемого образа: им приложение тегает сборку (`task image`),
|
||||||
|
# под ним же роль app_image везёт образ на сервер и его находит docker-compose.
|
||||||
# Registry images
|
homepage_image_name: "homepage-nginx"
|
||||||
registry_homepage_nginx_image: "{{ (docker_registry_prefix, homepage_nginx_image) | path_join }}"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user