From 9f0a6cc6f1bb3d5cce724c13e36b2026405b7c4b Mon Sep 17 00:00:00 2001 From: DDSRem <1448139087@qq.com> Date: Sat, 20 May 2023 16:56:49 +0800 Subject: [PATCH] feat: support armv7 --- .github/workflows/docker.yml | 2 +- Dockerfile | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a3f9c936..4719f2e8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -76,7 +76,7 @@ jobs: with: context: . builder: ${{ steps.buildx.output.name }} - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 push: ${{ github.event_name == 'push' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 65d5ff4b..e528eb89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM python:3.11-alpine AS APP +FROM alpine:3.18 AS APP ENV S6_SERVICES_GRACETIME=30000 \ S6_KILL_GRACETIME=60000 \ @@ -18,11 +18,19 @@ WORKDIR /app COPY requirements.txt . RUN apk add --no-cache \ + bash \ + ca-certificates \ + coreutils \ curl \ jq \ - shadow \ + netcat-openbsd \ + procps-ng \ + python3 \ + py3-bcrypt \ + py3-pip \ s6-overlay \ - bash && \ + shadow \ + tzdata && \ python3 -m pip install --upgrade pip && \ pip install --no-cache-dir -r requirements.txt && \ # Download WebUI