From 85e9669ba2c6aae78a17ec8d5afee8d8d0c2f8aa Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 6 Sep 2023 16:42:50 +0800 Subject: [PATCH] fix: build --- docker-cloud/Jenkins/docker-compose.yml | 2 -- docker-cloud/Jenkins/image/Dockerfile | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/docker-cloud/Jenkins/docker-compose.yml b/docker-cloud/Jenkins/docker-compose.yml index e4045f5d..38d3bdfd 100644 --- a/docker-cloud/Jenkins/docker-compose.yml +++ b/docker-cloud/Jenkins/docker-compose.yml @@ -11,8 +11,6 @@ services: - jenkins_home:/var/jenkins_home - /var/run/docker.sock:/var/run/docker.sock - /usr/bin/docker:/usr/bin/docker - # 只有操作系统为Debian可以使用,不一致自行进入容器使用 apt install docker-compose -y 中安装 - # - /usr/bin/docker-compose:/usr/bin/docker-compose ports: - 2023:8080 diff --git a/docker-cloud/Jenkins/image/Dockerfile b/docker-cloud/Jenkins/image/Dockerfile index 008a9858..2f38514e 100644 --- a/docker-cloud/Jenkins/image/Dockerfile +++ b/docker-cloud/Jenkins/image/Dockerfile @@ -10,19 +10,19 @@ RUN chmod -R 777 /var/jenkins_home/tools # 更换debian阿里软件源 RUN cp /etc/apt/sources.list /etc/apt/sources.list.bak -RUN cat </etc/apt/sources.list \ - deb http://mirrors.aliyun.com/debian/ buster main non-free contrib \ - deb-src http://mirrors.aliyun.com/debian/ buster main non-free contrib \ - deb http://mirrors.aliyun.com/debian-security buster/updates main \ - deb-src http://mirrors.aliyun.com/debian-security buster/updates main \ - deb http://mirrors.aliyun.com/debian/ buster-updates main non-free contrib \ - deb-src http://mirrors.aliyun.com/debian/ buster-updates main non-free contrib \ - deb http://mirrors.aliyun.com/debian/ buster-backports main non-free contrib \ - deb-src http://mirrors.aliyun.com/debian/ buster-backports main non-free contrib \ - EOF +RUN cat < /etc/apt/sources.list + deb http://mirrors.aliyun.com/debian/ buster main non-free contrib + deb-src http://mirrors.aliyun.com/debian/ buster main non-free contrib + deb http://mirrors.aliyun.com/debian-security buster/updates main + deb-src http://mirrors.aliyun.com/debian-security buster/updates main + deb http://mirrors.aliyun.com/debian/ buster-updates main non-free contrib + deb-src http://mirrors.aliyun.com/debian/ buster-updates main non-free contrib + deb http://mirrors.aliyun.com/debian/ buster-backports main non-free contrib + deb-src http://mirrors.aliyun.com/debian/ buster-backports main non-free contrib +EOF RUN apt-get clean RUN apt-get update # 安装docker-compose -RUM apt install docker-compose -y +RUN apt install docker-compose -y