Skip to content

Commit 779f374

Browse files
authored
Merge branch 'master' into chore/markdown
2 parents 2f0685e + ebe8b22 commit 779f374

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.github/workflows/docker.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ on:
1010
branches:
1111
- master
1212

13-
env:
14-
PLATFORMS: "linux/arm,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
15-
1613
concurrency:
1714
group: ${{ github.ref_name }}-docker
1815
cancel-in-progress: true
@@ -89,7 +86,7 @@ jobs:
8986
with:
9087
pull: true
9188
push: true
92-
platforms: "linux/arm,linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
89+
platforms: "linux/arm,linux/amd64,linux/arm64,linux/ppc64le"
9390
tags: ${{ steps.meta.outputs.tags }}
9491
labels: ${{ steps.meta.outputs.labels }}
9592
annotations: ${{ steps.meta.outputs.annotations }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN xx-apt install -y xx-cxx-essentials zlib1g-dev libcurl4-openssl-dev libc-are
3535

3636

3737
### Build base image for alpine
38-
FROM --platform=$BUILDPLATFORM alpine:3.21 AS build-base-alpine
38+
FROM --platform=$BUILDPLATFORM alpine:3.22 AS build-base-alpine
3939

4040
RUN apk add --no-cache \
4141
alpine-sdk \

0 commit comments

Comments
 (0)