Update docker support for ARM

This commit is contained in:
Stille 2021-05-29 17:01:29 +08:00
parent e7117d89bd
commit bac6726ca6
3 changed files with 42 additions and 1 deletions

38
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,38 @@
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}

View File

@ -1,7 +1,7 @@
FROM tindy2013/subconverter
MAINTAINER Stille <stille@ioiox.com>
ENV VERSION v0.6.4
ENV VERSION 0.6.4
WORKDIR /base
RUN apk add tzdata && \

View File

@ -7,6 +7,9 @@ subconverter 是基于原版 [[tindy2013/subconverter]](https://github.com/tindy
- **全球拦截** 增加`节点选择`,以满足`Google Analytics`等广告统计工具的访问需求.(新版本可能已解决此需求)
- **修改时区** 镜像默认时区为 Asia/Shanghai
## 更新
**2021-05-29** 更新从`0.6.4`版本起 docker 镜像同时支持 X86 和 ARM
## 部署
### docker 部署
```shell