From 2c11be59c59492dcd5593363338a818979663609 Mon Sep 17 00:00:00 2001 From: Stille Date: Tue, 21 Sep 2021 19:52:57 +0800 Subject: [PATCH] Update v0.7.0 --- .github/workflows/build.yml | 38 ------------------------------------- Dockerfile | 2 +- README.md | 4 ++-- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 5ecf526..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: "build for docker" - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set tag - id: tag - run: | - TAG=$(cat Dockerfile | awk 'NR==4 {print $3}') - echo "::set-env name=TAG::$TAG" - - name: Docker Hub login - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: | - echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin - - name: Set up Docker Buildx - id: buildx - uses: crazy-max/ghaction-docker-buildx@v1 - with: - buildx-version: latest - - name: Build Dockerfile - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - run: | - docker buildx build \ - --platform=linux/amd64,linux/arm/v7,linux/arm64 \ - --output "type=image,push=true" \ - --file ./Dockerfile . \ - --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ github.event.repository.name }}:latest \ - --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ github.event.repository.name }}:${TAG} diff --git a/Dockerfile b/Dockerfile index 1a6938e..dc1c940 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM tindy2013/subconverter MAINTAINER Stille -ENV VERSION 0.6.4 +ENV VERSION 0.7.0 WORKDIR /base RUN apk add tzdata && \ diff --git a/README.md b/README.md index 0a76f5e..d08ff8f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ - **修改时区** 镜像默认时区为 Asia/Shanghai ## 更新 -**2021-06-09** 更新`v0.6.4`版 docker 镜像,新增同时支持 X86 和 ARM 架构. +- **2021-09-21** 更新`v0.7.0`版 docker 镜像 +- **2021-06-09** 更新`v0.6.4`版 docker 镜像,新增同时支持 X86 和 ARM 架构. ## 部署 ### docker @@ -31,4 +32,3 @@ https://subto.herokuapp.com ## 参考 GitHub [tindy2013/subconverter](https://github.com/tindy2013/subconverter) -