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