From 3021a495f99d561a5eada62efef5c4856c6b3739 Mon Sep 17 00:00:00 2001 From: okxlin Date: Sun, 20 Aug 2023 02:44:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=AD=A3s390x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s390x/latest/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/s390x/latest/Dockerfile b/s390x/latest/Dockerfile index 0dd4b9c..4842a08 100644 --- a/s390x/latest/Dockerfile +++ b/s390x/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM ubuntu:22.04 # 安装所需的软件包并清理 RUN apt-get update && apt-get install -y \ @@ -8,22 +8,25 @@ RUN apt-get update && apt-get install -y \ curl \ gnupg \ git \ + sudo \ #openssh-server \ apt-transport-https \ + software-properties-common \ && apt-get clean && rm -rf /var/lib/apt/lists/* # 设置时区 ENV TZ=Asia/Shanghai RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -# 设置 Docker 仓库 -RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \ - echo "deb [arch=s390x signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian bullseye stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null +# 添加 Docker 仓库 +RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \ + echo "deb [arch=s390x signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" > /etc/apt/sources.list.d/docker.list # 安装 Docker CLI RUN apt-get update && apt-get install -y docker-ce-cli && \ apt-get clean && rm -rf /var/lib/apt/lists/* + # 安装 Docker Compose RUN curl -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \ ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose && \