Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

更新了cn的基础镜像，用于解决maa的GLIBC_2.34缺失问题 #4637

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

更新了cn的基础镜像，用于解决maa的GLIBC_2.34缺失问题 #4637

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a33b067
更新基础镜像
Lyiyeyulongwu Mar 2, 2025
3351b1b
更新基础镜像
Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions deploy/docker/Dockerfile.cn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# docker build -t hgjazhgj/alas:latest .
# docker run -v ${PWD}:/app/AzurLaneAutoScript -p 22267:22267 --name alas -it --rm hgjazhgj/alas

FROM python:3.7-slim-bullseye
FROM python:3.7-slim-bookworm
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不要动基础镜像了，所有环境就固定在当前时间节点或者当年的时间节点

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lmeszinc 我很理解你需要固定环境的想法，但是，这是docker当初的设计的问题，注意，我所更改的文件是Dockerfile.cn 而不是Dockerfile 这是因为在Dockerfile中他所使用的镜像是python:3.7-slim，这是一个动态镜像，他会实时更新最新版本，在当时建立的时候他使用的文件是python:3.7-slim-bullseye，而在现在这个镜像标签下面使用的是python:3.7-slim-bookworm,至于为什么Dockerfile.cn需要指示到具体的，而不是使用动态镜像标签，这是因为换源的地址需要指示到具体的版本，所以我认为我的提交是必须且应该的，在Dockerfile文件里面指示的镜像，已经是最新的bookworm了

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

屏幕截图 2025-03-08 192649这是相关说明，python:3.7-slim确实是动态镜像他的最底层镜像已经是debian12了
屏幕截图 2025-03-08 192725
这是需要修改的，他的最底层镜像还是debian11了
屏幕截图 2025-03-08 193112
这是我提交修改的镜像
LmeSzinc,提供镜像的SHA256标签，你也应该明白python:3.7-slim目前确实是指向python:3.7-slim-bookworm的


WORKDIR /app/AzurLaneAutoScript

COPY requirements.txt /tmp/requirements.txt

# python:3.7-slim is based on debian:11, apt source from https://developer.aliyun.com/mirror/debian
# python:3.7-slim-bookworm is based on debian:12, apt source from https://developer.aliyun.com/mirror/debian
RUN echo "\
deb https://mirrors.aliyun.com/debian/ bullseye main non-free contrib\n\
deb-src https://mirrors.aliyun.com/debian/ bullseye main non-free contrib\n\
deb https://mirrors.aliyun.com/debian-security/ bullseye-security main\n\
deb-src https://mirrors.aliyun.com/debian-security/ bullseye-security main\n\
deb https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib\n\
deb-src https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib\n\
deb https://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib\n\
deb-src https://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" \
deb https://mirrors.aliyun.com/debian/ bookworm main non-free contrib\n\
deb-src https://mirrors.aliyun.com/debian/ bookworm main non-free contrib\n\
deb https://mirrors.aliyun.com/debian-security/ bookworm-security main\n\
deb-src https://mirrors.aliyun.com/debian-security/ bookworm-security main\n\
deb https://mirrors.aliyun.com/debian/ bookworm-updates main non-free contrib\n\
deb-src https://mirrors.aliyun.com/debian/ bookworm-updates main non-free contrib\n\
deb https://mirrors.aliyun.com/debian/ bookworm-backports main non-free contrib\n\
deb-src https://mirrors.aliyun.com/debian/ bookworm-backports main non-free contrib" \
> /etc/apt/sources.list \
&& apt update \
&& apt install -y git adb libgomp1 openssh-client \
Expand Down