Merge pull request #292 from Tardis07/master

更新Docker相关的部分

.github/workflows/docker-image.yml

@@ -0,0 +1,32 @@
+name: Release Docker Image
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+    name: build and push
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v3
+    
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Setup Docker buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_PASS }}
+    
+    - name: Build the Docker image
+      run: docker buildx build --push --platform linux/amd64,linux/arm64 -t shimlylty/oneforall:latest .

Dockerfile

@@ -1,5 +1,5 @@
-FROM python:3.8-alpine3.10
+FROM --platform=$TARGETPLATFORM python:3.8-alpine3.10
-MAINTAINER milktea@vmoe.info
+LABEL maintainer="milktea@vmoe.info"
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 RUN apk update && apk --no-cache add git build-base libffi-dev libxml2-dev libxslt-dev libressl-dev
@@ -10,7 +10,7 @@ RUN git clone https://github.com/blechschmidt/massdns
 WORKDIR /massdns
 RUN make 
 ADD . /OneForAll/
-RUN mv /massdns/bin/massdns /OneForAll/thirdparty/massdns/massdns_linux_x86_64
+RUN mv /massdns/bin/massdns /OneForAll/thirdparty/massdns/massdns_linux_$(uname -m)
 RUN mkdir /OneForAll/results
 WORKDIR /OneForAll/
 

README.md

@@ -80,6 +80,8 @@ git stash pop    # 释放本地修改
 ```
 config
 ├── api.py
+├── default.py
+├── __init__.py
 ├── log.py
 └── setting.py
 ```