Исправлено определение тега для redos в docker-get-base-tag
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Ansible Testing / test (default) (push) Has been cancelled
Ansible Testing / test (minimal) (push) Has been cancelled
Ansible Testing / test (performance) (push) Has been cancelled
Ansible Testing / deploy-check (push) Has been cancelled
Some checks failed
Ansible Testing / lint (push) Has been cancelled
Ansible Testing / test (default) (push) Has been cancelled
Ansible Testing / test (minimal) (push) Has been cancelled
Ansible Testing / test (performance) (push) Has been cancelled
Ansible Testing / deploy-check (push) Has been cancelled
This commit is contained in:
4
Makefile
4
Makefile
@@ -838,10 +838,10 @@ docker-get-base-tag:
|
||||
docker pull $$BASE_IMAGE >/dev/null 2>&1 || echo "⚠️ Не удалось загрузить $$BASE_IMAGE" >&2; \
|
||||
TAG=$$(docker inspect --format='{{.RepoTags}}' $$BASE_IMAGE 2>/dev/null | tr -d '[]' | cut -d',' -f1 | cut -d':' -f2 | tr -d ' ' || echo "latest");; \
|
||||
redos) \
|
||||
BASE_IMAGE="registry.red-soft.ru/ubi7/ubi"; \
|
||||
BASE_IMAGE="registry.red-soft.ru/ubi7/ubi:latest"; \
|
||||
echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
|
||||
docker pull $$BASE_IMAGE >/dev/null 2>&1 || echo "⚠️ Не удалось загрузить $$BASE_IMAGE" >&2; \
|
||||
TAG=$$(docker inspect --format='{{.RepoTags}}' $$BASE_IMAGE 2>/dev/null | tr -d '[]' | cut -d',' -f1 | cut -d':' -f2 | tr -d ' ' || echo "latest");; \
|
||||
TAG="latest";; \
|
||||
rhel) \
|
||||
BASE_IMAGE="registry.access.redhat.com/ubi8/ubi"; \
|
||||
echo "📦 Загрузка базового образа $$BASE_IMAGE..." >&2; \
|
||||
|
||||
Reference in New Issue
Block a user