From 1a8e7d6af29f57b1f6a08e998a619ede3a1a0ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=90=D0=BD=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BF=D0=BE=D0=B2?= Date: Sat, 25 Oct 2025 16:47:11 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20Dockerfiles=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20Ubuntu=20=D0=B8=20Debian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Убрана установка yq (проблемы с архитектурой) - Исправлена установка Docker для правильной архитектуры - Использование dpkg --print-architecture вместо hardcoded amd64 - Упрощена структура Dockerfiles - Образы успешно собраны и отправлены в Docker Hub Исправления: - Ubuntu 22.04: inecs/ansible-lab:ubuntu-22.04 - Debian bookworm: inecs/ansible-lab:debian-bookworm --- dockerfiles/debian/Dockerfile | 6 +----- dockerfiles/ubuntu/Dockerfile | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dockerfiles/debian/Dockerfile b/dockerfiles/debian/Dockerfile index 97e87b5..52da404 100644 --- a/dockerfiles/debian/Dockerfile +++ b/dockerfiles/debian/Dockerfile @@ -24,10 +24,6 @@ RUN apt-get install -y \ python3-pip \ && apt-get clean -# Устанавливаем yq -RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \ - && chmod +x /usr/local/bin/yq - # Устанавливаем Docker вручную для Debian RUN apt-get update && apt-get install -y \ ca-certificates \ @@ -36,7 +32,7 @@ RUN apt-get update && apt-get install -y \ lsb-release \ && mkdir -p /usr/share/keyrings \ && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ - && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bookworm stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ && apt-get update \ && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ && apt-get clean diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile index 120f138..7261a20 100644 --- a/dockerfiles/ubuntu/Dockerfile +++ b/dockerfiles/ubuntu/Dockerfile @@ -24,10 +24,6 @@ RUN apt-get install -y \ python3-pip \ && apt-get clean -# Устанавливаем yq -RUN wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \ - && chmod +x /usr/local/bin/yq - # Устанавливаем Docker вручную для Ubuntu RUN apt-get update && apt-get install -y \ ca-certificates \ @@ -36,7 +32,7 @@ RUN apt-get update && apt-get install -y \ lsb-release \ && mkdir -p /usr/share/keyrings \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg \ - && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \ && apt-get update \ && apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin \ && apt-get clean