Skip to content

Commit

Permalink
build |> 尝试更新Dockerfile解决编译失败问题
Browse files Browse the repository at this point in the history
  • Loading branch information
xuyanling committed Aug 16, 2023
1 parent b67663a commit 431f0d4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN apk add --no-cache --virtual .build-deps \
libxslt-dev \
&& apk add --no-cache $(echo $(wget --no-check-certificate -qO- https://raw.githubusercontent.com/hsuyelin/nas-tools/master/package_list.txt)) \
&& curl https://rclone.org/install.sh | bash \
&& ln -sf /usr/bin/python3 /usr/bin/python \
&& if [ "$(uname -m)" = "x86_64" ]; then ARCH=amd64; elif [ "$(uname -m)" = "aarch64" ]; then ARCH=arm64; fi \
&& curl https://dl.min.io/client/mc/release/linux-${ARCH}/mc --create-dirs -o /usr/bin/mc \
&& chmod +x /usr/bin/mc \
Expand Down Expand Up @@ -44,7 +43,6 @@ RUN mkdir ${HOME} \
&& adduser -S nt -G nt -h ${HOME} -s /bin/bash -u 911 \
&& python_ver=$(python3 -V | awk '{print $2}') \
&& python_path=$(which python3) \
&& echo "${python_path} <<<<<<<<<<----------------------->>>>>>>>>> ${python_ver}" \
&& [ -d "/usr/lib/python${python_ver%.*}/site-packages" ] || mkdir -p "/usr/lib/python${python_ver%.*}/site-packages" \
&& echo "${WORKDIR}/" > /usr/lib/python${python_ver%.*}/site-packages/nas-tools.pth \
&& echo 'fs.inotify.max_user_watches=5242880' >> /etc/sysctl.conf \
Expand Down
2 changes: 1 addition & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/dumb-init /bin/sh
#!/bin/sh

# 仅用于兼容v3.1.5及之前的docker镜像

Expand Down
2 changes: 0 additions & 2 deletions package_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ ffmpeg
fuse3
git
inotify-tools
python3-dev
py3-pip
redis
s6-overlay
shadow
Expand Down

0 comments on commit 431f0d4

Please sign in to comment.