Skip to content

Commit

Permalink
update docker
Browse files Browse the repository at this point in the history
  • Loading branch information
royzheng committed May 17, 2023
1 parent 8a087d7 commit 19f6f5c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- dev
paths:
- version.py
- .github/workflows/build-package.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- dev
paths:
- version.py
- .github/workflows/build.yml
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![Platform](https://img.shields.io/badge/platform-amd64/arm64-pink?style=plastic)](https://hub.docker.com/r/jxxghp/nas-tools)


Docker:https://hub.docker.com/repository/docker/challengerv/nas-tools
Docker:https://hub.docker.com/repository/docker/royzheng/nas-tools

TG频道:https://t.me/nastool_official (官方)

Expand All @@ -31,7 +31,7 @@ NAS媒体库管理工具。
## 安装
### 1、Docker
```
docker pull challengerv/nas-tools-unlock:latest
docker pull royzheng/nas-tools:3.2.2
```
教程见 [这里](docker/readme.md)

Expand All @@ -40,7 +40,7 @@ docker pull challengerv/nas-tools-unlock:latest
### 2、本地运行
python3.10版本,需要预安装cython,如发现缺少依赖包需额外安装:
```
git clone -b master https://github.com/YaoShuwei/nas-tools-unlock --recurse-submodule
git clone -b master https://github.com/royzheng/nas-tools --recurse-submodule
python3 -m pip install -r requirements.txt
export NASTOOL_CONFIG="/xxx/config/config.yaml"
nohup python3 run.py &
Expand All @@ -49,7 +49,6 @@ nohup python3 run.py &
### 3、可执行文件
下载打包好的执行文件运行即可,会自动生成配置文件目录:

https://github.com/YaoShuwei/nas-tools-unlock/releases

### 4、群晖套件
添加矿神群晖SPK套件源直接安装:
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ RUN apk add --no-cache --virtual .build-deps \
musl-dev \
libxml2-dev \
libxslt-dev \
&& apk add --no-cache $(echo $(wget --no-check-certificate -qO- https://raw.githubusercontent.com/YaoShuwei/nas-tools-unlock/master/package_list.txt)) \
&& apk add --no-cache $(echo $(wget --no-check-certificate -qO- https://raw.githubusercontent.com/royzheng/nas-tools/master/package_list.txt)) \
&& ln -sf /usr/bin/python3 /usr/bin/python \
&& curl https://rclone.org/install.sh | bash \
&& 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 \
&& pip install --upgrade pip setuptools wheel \
&& pip install cython \
&& pip install -r https://raw.githubusercontent.com/YaoShuwei/nas-tools-unlock/master/requirements.txt \
&& pip install -r https://raw.githubusercontent.com/royzheng/nas-tools/master/requirements.txt \
&& apk del --purge .build-deps \
&& rm -rf /tmp/* /root/.cache /var/cache/apk/*
COPY --chmod=755 ./rootfs /
Expand All @@ -29,11 +29,11 @@ ENV S6_SERVICES_GRACETIME=30000 \
LANG="C.UTF-8" \
TZ="Asia/Shanghai" \
NASTOOL_CONFIG="/config/config.yaml" \
NASTOOL_AUTO_UPDATE=true \
NASTOOL_AUTO_UPDATE=false \
NASTOOL_CN_UPDATE=true \
NASTOOL_VERSION=master \
PS1="\u@\h:\w \$ " \
REPO_URL="https://github.com/YaoShuwei/nas-tools-unlock.git" \
REPO_URL="https://github.com/royzheng/nas-tools.git" \
PYPI_MIRROR="https://pypi.tuna.tsinghua.edu.cn/simple" \
ALPINE_MIRROR="mirrors.ustc.edu.cn" \
PUID=0 \
Expand Down

0 comments on commit 19f6f5c

Please sign in to comment.