Вернул dockerfile и пофиксил makefile от ошибок
This commit is contained in:
6
Makefile
6
Makefile
@@ -29,7 +29,7 @@ view create edit show delete test lint deploy new init build rebuild prune relea
|
||||
####################################################################################################
|
||||
init:
|
||||
@echo "Шаг 1: Создание Docker-образа..."
|
||||
@make docker build
|
||||
@make docker rebuild
|
||||
@echo "Шаг 2: Создание нового vault-файла с паролем..."
|
||||
@read -p "Введите пароль для vault: " VAULT_PASSWORD; \
|
||||
echo "$$VAULT_PASSWORD" > vault-password.txt; \
|
||||
@@ -51,7 +51,7 @@ docker:
|
||||
if [ "$(RUN_MODE)" = "docker-compose" ]; then \
|
||||
docker compose build $(c); \
|
||||
else \
|
||||
docker buildx build -t $(REGISTRY)/ansible/$(IMAGE) --platform linux/amd64,linux/arm64 .; \
|
||||
docker build -t $(REGISTRY)/ansible/$(IMAGE) .; \
|
||||
fi; \
|
||||
rm id_rsa;; \
|
||||
rebuild) \
|
||||
@@ -60,7 +60,7 @@ docker:
|
||||
if [ "$(RUN_MODE)" = "docker-compose" ]; then \
|
||||
docker compose build --no-cache $(c); \
|
||||
else \
|
||||
docker buildx build --no-cache -t $(REGISTRY)/ansible/$(IMAGE) --platform linux/amd64,linux/arm64 .; \
|
||||
docker build --no-cache -t $(REGISTRY)/ansible/$(IMAGE) .; \
|
||||
fi; \
|
||||
rm id_rsa;; \
|
||||
prune) \
|
||||
|
||||
Reference in New Issue
Block a user