Makefile fix

This commit is contained in:
2025-03-13 11:24:14 +03:00
parent 4e5ae1e78b
commit 0c3bacfe9c
3 changed files with 35 additions and 16 deletions

View File

@@ -3,6 +3,7 @@ FROM python:3.12.9-bullseye
# Set environment variables # Set environment variables
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
ENV EDITOR=nano
# Install system dependencies # Install system dependencies
RUN apt-get update && \ RUN apt-get update && \
@@ -15,6 +16,8 @@ RUN apt-get update && \
make \ make \
sudo \ sudo \
sshpass \ sshpass \
nano \
less \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install Docker CLI # Install Docker CLI

View File

@@ -55,24 +55,34 @@ logs:
shell: shell:
docker compose exec ansible bash docker compose exec ansible bash
####################################################################################################
# Работа с ролью
####################################################################################################
view create edit view delete test lint deploy:
@true
.PHONY: test lint vault deploy vault:
@case "$(word 2, $(MAKECMDGOALS))" in \
view) docker compose run --rm ansible bash -c "ansible-vault view --vault-password-file vault-password.txt roles/role/vars/secrets.yml";; \
create) docker compose run --rm ansible bash -c "ansible-vault create --encrypt-vault-id default --vault-password-file vault-password.txt roles/role/vars/secrets.yml";; \
edit) docker compose run --rm ansible bash -c "ansible-vault edit --vault-password-file vault-password.txt roles/role/vars/secrets.yml";; \
delete) docker compose run --rm ansible bash -c "rm roles/role/vars/secrets.yml";; \
*) echo "Unknown action";; \
esac
test: ## Запуск тестов с molecule role:
docker compose run --rm ansible bash -c "molecule test" @case "$(word 2, $(MAKECMDGOALS))" in \
test) \
lint: ## Проверка кода с ansible-lint echo "Running test roles..."; \
docker compose run --rm ansible bash -c "ansible-lint roles/role" docker compose run --rm ansible bash -c "molecule test";; \
lint) \
vault_create: ## Шифрование/дешифрование с ansible-vault echo "Check your role..."; \
docker compose run --rm ansible bash -c "ansible-vault create --encrypt-vault-id default --vault-password-file vault-password.txt roles/role/vars/secrets.yml" docker compose run --rm ansible bash -c "ansible-lint roles/role";; \
deploy) \
vault_edit: ## Шифрование/дешифрование с ansible-vault echo "Deploying roles to production..."; \
docker compose run --rm ansible bash -c "ansible-vault edit --vault-password-file vault-password.txt roles/role/vars/secrets.yml" docker compose run --rm ansible /usr/bin/sh -c "ansible-playbook -i inventory/production deploy.yml --vault-password-file vault-password.txt";; \
*) echo "Unknown action";; \
deploy: test ## Деплой на реальные машины, если тест прошел успешно esac
@echo "Deploying roles to production..."
docker compose run --rm ansible /usr/bin/sh -c "ansible-playbook -i inventory/production deploy.yml --vault-password-file vault-password.txt"
#################################################################################################### ####################################################################################################
# Работа с Git # Работа с Git

View File

@@ -0,0 +1,6 @@
$ANSIBLE_VAULT;1.1;AES256
30363439326335316131303133653930363431336539356134363933656566663330366165616366
6639353565306634613164636161353362643237353933610a323838666436363835303765323930
62333364613535656138623233666635303934376234633937666131366239323436333334646666
6364303839396532310a633636333665346538313931366666333665363163623966666236346666
6464