diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml index 45e7668..d188a45 100644 --- a/.github/workflows/publish-image.yaml +++ b/.github/workflows/publish-image.yaml @@ -31,9 +31,9 @@ jobs: if [[ $VERSION =~ ^5\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then TAGS="$TAGS,${DOCKER_IMAGE}:latest" fi - echo ::set-output name=tags::${TAGS} - echo ::set-output name=version::${VERSION} - echo ::set-output name=major::${MAJOR} + echo "tags=${TAGS}" >> $GITHUB_OUTPUT + echo "version=${VERSION}" >> $GITHUB_OUTPUT + echo "major=${MAJOR}" >> $GITHUB_OUTPUT - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -48,9 +48,9 @@ jobs: uses: actions/cache@v4 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.major }}-${{ hashFiles('alpine/${{ steps.prep.outputs.major }}/cache_buster') }}-${{ github.sha }} + key: ${{ runner.os }}-buildx-5-${{ hashFiles('alpine/5/cache_buster') }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ steps.prep.outputs.major }}-${{ hashFiles('alpine/${{ steps.prep.outputs.major }}/cache_buster') }}- + ${{ runner.os }}-buildx-5-${{ hashFiles('alpine/5/cache_buster') }}- - name: Login to DockerHub if: github.event_name != 'pull_request' @@ -75,6 +75,7 @@ jobs: - name: Move cache run: | + mkdir -p /tmp/.buildx-cache rm -rf /tmp/.buildx-cache mv /tmp/.buildx-cache-new /tmp/.buildx-cache diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index afd1f54..0f1e214 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -47,6 +47,12 @@ RUN set -eux; \ chromium \ # font-noto-cjk-extra \ # font-wqy-zenhei \ + freetype \ + libpng \ + libjpeg-turbo \ + freetype-dev \ + libpng-dev \ + libjpeg-turbo-dev \ ttf-freefont \ ttf-dejavu