From 740eecda8f690a12621b04077745aa238c8c946e Mon Sep 17 00:00:00 2001 From: YuCat-OVO <66810215+YuCat-OVO@users.noreply.github.com> Date: Sun, 3 Mar 2024 23:35:47 +0800 Subject: [PATCH] 1.0.4 --- .github/workflows/build.yml | 5 ++++- Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 079fc38..8d19d65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,18 +27,20 @@ jobs: - name: Set variables id: set-vars run: | - VERSION="1.0.3" + VERSION="1.0.4" GITHUB_REF=${{ github.ref }} BRACH=${GITHUB_REF#refs/heads/} DATE=$(date '+%Y-%m-%dT%H:%M:%S%Z') ARCH=${{ matrix.arch }} PLATFORM_PAIR=${ARCH//\//-} + PLATFORM=${ARCH//linux\//} echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT echo "GITHUB_REF=${GITHUB_REF}" >> $GITHUB_OUTPUT echo "BRACH=${BRACH}" >> $GITHUB_OUTPUT echo "DATE=${DATE}" >> $GITHUB_OUTPUT echo "PLATFORM_PAIR=${PLATFORM_PAIR}" >> $GITHUB_OUTPUT + echo "PLATFORM=${PLATFORM}" >> $GITHUB_OUTPUT - name: Docker Meta id: meta @@ -50,6 +52,7 @@ jobs: tags: | type=raw,value=${{ steps.set-vars.outputs.VERSION }} type=raw,value=${{ steps.set-vars.outputs.BRACH }} + type=raw,value=${{ steps.set-vars.outputs.PLATFORM }} type=raw,value=latest - name: Set up QEMU diff --git a/Dockerfile b/Dockerfile index 891ef64..999f6b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN \ fi && \ export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get install -y --no-install-recommends \ + apt-get -yy -qq install --no-install-recommends --no-install-suggests --fix-missing \ wget \ fonts-wqy-microhei \ fonts-wqy-zenhei \ @@ -84,7 +84,7 @@ RUN \ then \ echo "${i} installed,skip"; \ else \ - apt-get install -y --no-install-recommends ${i}; \ + apt-get -yy -qq install --no-install-recommends --no-install-suggests --fix-missing ${i}; \ fi \ done && \ dpkg -i /tmp/baidunetdisk.deb && \