diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index cc68a0bb6..66d09ad07 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,7 +1,7 @@ # 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 +FROM python:3.7-slim-bullseye WORKDIR /app/AzurLaneAutoScript @@ -10,7 +10,12 @@ COPY requirements.txt /tmp/requirements.txt # Initial download of UiAutomator2 is slow outside of China using appetizer mirror, switch to GitHub RUN apt update \ && apt install -y git adb libgomp1 openssh-client \ + && apt install -y build-essential pkg-config \ + && apt install -y libavformat-dev libavcodec-dev libavdevice-dev \ + && apt install -y libavutil-dev libswscale-dev libswresample-dev libavfilter-dev \ && git config --global --add safe.directory '*' \ + && pip install Cython==0.29.37 \ + && pip install av==10.0.0 --no-build-isolation \ && pip install -r /tmp/requirements.txt \ && rm /tmp/requirements.txt \ && rm -r ~/.cache/pip diff --git a/deploy/docker/Dockerfile.cn b/deploy/docker/Dockerfile.cn index 2db750c3a..c7d879d4d 100644 --- a/deploy/docker/Dockerfile.cn +++ b/deploy/docker/Dockerfile.cn @@ -14,16 +14,19 @@ 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-src https://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" \ > /etc/apt/sources.list \ && apt update \ && apt install -y git adb libgomp1 openssh-client \ + && apt install -y build-essential pkg-config \ + && apt install -y libavformat-dev libavcodec-dev libavdevice-dev \ + && apt install -y libavutil-dev libswscale-dev libswresample-dev libavfilter-dev \ && git config --global --add safe.directory '*' \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && echo 'Asia/Shanghai' > /etc/timezone \ && pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple \ + && pip install Cython==0.29.37 \ + && pip install av==10.0.0 --no-build-isolation \ && pip install -r /tmp/requirements.txt \ && rm /tmp/requirements.txt \ && rm -r ~/.cache/pip