From 0cb82ef84adc8652d3e419554a926e29f085cbd9 Mon Sep 17 00:00:00 2001 From: JRoot Junior Date: Sun, 7 Jan 2024 15:31:06 +0200 Subject: [PATCH] Update alpine version --- .github/workflows/multiarch.yml | 7 +++++-- Dockerfile | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml index 689b951..ef9715c 100644 --- a/.github/workflows/multiarch.yml +++ b/.github/workflows/multiarch.yml @@ -4,8 +4,8 @@ on: push: branches: - master -# schedule: -# - cron: '20 4 * * *' + schedule: + - cron: '20 4 * * *' jobs: build: @@ -13,6 +13,7 @@ jobs: runs-on: ubuntu-latest env: IMAGE_TAG: ${{ secrets.DOCKERHUB_OWNER }}/telegram-bot-api + ALPINE_VERSION: 3.19 strategy: matrix: arch: @@ -95,6 +96,8 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,mode=max,dest=/tmp/.buildx-cache platforms: ${{ matrix.arch }} + build-args: | + ALPINE_VERSION=${{ env.ALPINE_VERSION }} push: false load: true tags: | diff --git a/Dockerfile b/Dockerfile index 2b1fd48..3e49b94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM alpine:3.18 as build +ARG APLINE_VERSION +FROM alpine:${APLINE_VERSION} as build ENV CXXFLAGS="" WORKDIR /usr/src/telegram-bot-api @@ -12,7 +13,7 @@ RUN mkdir -p build \ && cmake --build . --target install -j ${nproc} \ && strip /usr/src/telegram-bot-api/bin/telegram-bot-api -FROM alpine:3.18 +FROM alpine:${APLINE_VERSION} ENV TELEGRAM_WORK_DIR="/var/lib/telegram-bot-api" \ TELEGRAM_TEMP_DIR="/tmp/telegram-bot-api"