From 5724bb735031db79f55b44c1bfbfa4fe4dc79dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 10:02:42 +0800 Subject: [PATCH 1/7] Create docker-image.yml --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..95469aa --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + name: build + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From fcc0e0e6625dc52334112b6dceb5e52b37d77b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 10:19:37 +0800 Subject: [PATCH 2/7] Update docker-image.yml --- .github/workflows/docker-image.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 95469aa..d4ff9d3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: Release Docker Image on: push: @@ -13,6 +13,20 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - 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 build . --file Dockerfile --tag my-image-name:$(date +%s) + run: docker buildx build --push --platform linux/amd64 -t tardis07/oneforall:latest From 5ba05231a910ce08f29145b46a87a878b58e9ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 10:21:04 +0800 Subject: [PATCH 3/7] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d4ff9d3..d7829f4 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,4 +29,4 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASS }} - name: Build the Docker image - run: docker buildx build --push --platform linux/amd64 -t tardis07/oneforall:latest + run: docker buildx build --push --platform linux/amd64 -t tardis07/oneforall:latest . From 96c31c5b97e25209720dc1a78af220404a5c9148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 03:03:46 +0000 Subject: [PATCH 4/7] add multi-platform release --- .github/workflows/docker-image.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d7829f4..cbe8723 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,4 +29,4 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASS }} - name: Build the Docker image - run: docker buildx build --push --platform linux/amd64 -t tardis07/oneforall:latest . + run: docker buildx build --push --platform linux/amd64,linux/arm64,linux/386 -t tardis07/oneforall:latest . diff --git a/Dockerfile b/Dockerfile index 6e6b3e8..e4d3d15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-alpine3.10 +FROM --platform=$TARGETPLATFORM python:3.8-alpine3.10 MAINTAINER milktea@vmoe.info RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories @@ -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/ From 141836832dc3a920b705a64d100d5ad17f16c2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 03:17:01 +0000 Subject: [PATCH 5/7] docker multi-platform release support --- .github/workflows/docker-image.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index cbe8723..1b40847 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,4 +29,4 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASS }} - name: Build the Docker image - run: docker buildx build --push --platform linux/amd64,linux/arm64,linux/386 -t tardis07/oneforall:latest . + run: docker buildx build --push --platform linux/amd64,linux/arm64,linux/i386 -t tardis07/oneforall:latest . diff --git a/Dockerfile b/Dockerfile index e4d3d15..e539b62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ 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 From a816f81cd1d600456f98bcd0e3d367083c5a4cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 03:23:28 +0000 Subject: [PATCH 6/7] add arm64 support --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 1b40847..5fd5546 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,4 +29,4 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASS }} - name: Build the Docker image - run: docker buildx build --push --platform linux/amd64,linux/arm64,linux/i386 -t tardis07/oneforall:latest . + run: docker buildx build --push --platform linux/amd64,linux/arm64 -t tardis07/oneforall:latest . From 3311d4a6ea8511e42ec9af3e4257017295f4e8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=B6=E8=8C=B6=E8=AF=B4?= Date: Fri, 6 Jan 2023 05:01:18 +0000 Subject: [PATCH 7/7] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=20README=20?= =?UTF-8?q?=E4=B8=AD=E5=85=B3=E4=BA=8E=20`config`=20=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E7=9A=84=E6=8F=8F=E8=BF=B0=202.=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4=20Docker=20Hub=20?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=9A=84=20Action=203.=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20arm64=20=E7=B3=BB=E7=BB=9F=20Docker=20Image=20Release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image.yml | 4 ++-- README.md | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 5fd5546..3a62552 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -9,7 +9,7 @@ on: jobs: build: - name: build + name: build and push runs-on: ubuntu-latest steps: @@ -29,4 +29,4 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASS }} - name: Build the Docker image - run: docker buildx build --push --platform linux/amd64,linux/arm64 -t tardis07/oneforall:latest . + run: docker buildx build --push --platform linux/amd64,linux/arm64 -t shimlylty/oneforall:latest . diff --git a/README.md b/README.md index 2832b04..f3e5705 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,8 @@ git stash pop # 释放本地修改 ``` config ├── api.py +├── default.py +├── __init__.py ├── log.py └── setting.py ```