Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Bump alpine to 3.20 #2626

Closed
wants to merge 3 commits into from
Closed

[WIP] Bump alpine to 3.20 #2626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1dac05
Bump alpine to 3.20
mauromorales Jun 14, 2024
ac6d16b
Merge branch 'master' into bump-alpine-3.20
Itxaka Jul 17, 2024
b5e61a5
Merge branch 'master' into bump-alpine-3.20
Itxaka Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/flavors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,60 +252,60 @@
{
"family": "alpine",
"flavor": "alpine",
"flavorRelease": "3.19",
"flavorRelease": "3.20",
"variant": "standard",
"model": "generic",
"baseImage": "alpine:3.19",
"baseImage": "alpine:3.20",
"arch": "amd64",
"worker": "self-hosted"
},
{
"family": "alpine",
"flavor": "alpine",
"flavorRelease": "3.19",
"flavorRelease": "3.20",
"variant": "core",
"model": "generic",
"baseImage": "alpine:3.19",
"baseImage": "alpine:3.20",
"arch": "amd64",
"worker": "self-hosted"
},
{
"family": "alpine",
"flavor": "alpine",
"flavorRelease": "3.19",
"flavorRelease": "3.20",
"variant": "standard",
"model": "rpi4",
"baseImage": "alpine:3.19",
"baseImage": "alpine:3.20",
"arch": "arm64",
"worker": "ubuntu-latest"
},
{
"family": "alpine",
"flavor": "alpine",
"flavorRelease": "3.19",
"flavorRelease": "3.20",
"variant": "standard",
"model": "rpi3",
"baseImage": "alpine:3.19",
"baseImage": "alpine:3.20",
"arch": "arm64",
"worker": "ubuntu-latest"
},
{
"family": "alpine",
"flavor": "alpine",
"flavorRelease": "3.19",
"flavorRelease": "3.20",
"variant": "core",
"model": "rpi4",
"baseImage": "alpine:3.19",
"baseImage": "alpine:3.20",
"arch": "arm64",
"worker": "ubuntu-latest"
},
{
"family": "alpine",
"flavor": "alpine",
"flavorRelease": "3.19",
"flavorRelease": "3.20",
"variant": "core",
"model": "rpi3",
"baseImage": "alpine:3.19",
"baseImage": "alpine:3.20",
"arch": "arm64",
"worker": "ubuntu-latest"
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/image-arm-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
statuses: read
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
family: alpine
base_image: alpine:3.19
base_image: alpine:3.20
model: rpi4
worker: fast
18 changes: 9 additions & 9 deletions .github/workflows/image-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ jobs:
statuses: read
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
family: alpine
base_image: alpine:3.19
base_image: alpine:3.20
model: generic
variant: core
arch: amd64
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
uses: ./.github/workflows/reusable-install-test.yaml
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
needs:
- core-alpine

Expand All @@ -161,7 +161,7 @@ jobs:
uses: ./.github/workflows/reusable-qemu-acceptance-test.yaml
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
needs:
- core-alpine

Expand All @@ -185,7 +185,7 @@ jobs:
uses: ./.github/workflows/reusable-qemu-reset-test.yaml
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
needs:
- core-alpine

Expand All @@ -205,9 +205,9 @@ jobs:
uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
family: alpine
base_image: alpine:3.19
base_image: alpine:3.20
model: generic
variant: core
needs:
Expand All @@ -225,7 +225,7 @@ jobs:
uses: ./.github/workflows/reusable-upgrade-with-cli-test.yaml
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
needs:
- core-alpine

Expand Down Expand Up @@ -299,7 +299,7 @@ jobs:
uses: ./.github/workflows/reusable-encryption-test.yaml
with:
flavor: alpine
flavor_release: "3.19"
flavor_release: "3.20"
label: ${{ matrix.label }}
needs:
- core-alpine
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
matrix:
include:
- flavor: "alpine"
flavorRelease: "3.19"
flavorRelease: "3.20"
- flavor: "opensuse"
flavorRelease: "leap-15.6"
- flavor: "opensuse"
Expand Down Expand Up @@ -166,9 +166,9 @@ jobs:
matrix:
include:
- flavor: alpine
flavorRelease: "3.19"
flavorRelease: "3.20"
family: alpine
base_image: alpine:3.19
base_image: alpine:3.20
model: generic
variant: core
- flavor: opensuse
Expand All @@ -193,11 +193,11 @@ jobs:
matrix:
include:
- flavor: alpine
flavorRelease: "3.19"
flavorRelease: "3.20"
family: alpine
variant: core
model: generic
baseImage: alpine:3.19
baseImage: alpine:3.20
- flavor: opensuse
flavorRelease: leap-15.6
family: opensuse
Expand All @@ -222,7 +222,7 @@ jobs:
matrix:
include:
- flavor: alpine
flavorRelease: "3.19"
flavorRelease: "3.20"
- flavor: opensuse
flavorRelease: leap-15.6
# releaseMatcher: leap-15.5
Expand Down Expand Up @@ -331,9 +331,9 @@ jobs:
family: opensuse
baseImage: opensuse/leap:15.6
- flavor: alpine
flavorRelease: "3.19"
flavorRelease: "3.20"
family: alpine
baseImage: alpine:3.19
baseImage: alpine:3.20
- flavor: ubuntu
flavorRelease: "24.04"
family: ubuntu
Expand Down Expand Up @@ -384,7 +384,7 @@ jobs:
# flavorRelease: "3.19"
# label: "provider-decentralized-k8s"
- flavor: "alpine"
flavorRelease: "3.19"
flavorRelease: "3.20"
label: "provider-upgrade-k8s"
standard-upgrade-latest:
uses: ./.github/workflows/reusable-provider-upgrade-latest-test.yaml
Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG FAMILY=alpine
ARG FLAVOR
ARG FLAVOR_RELEASE
ARG MODEL=generic
ARG BASE_IMAGE=alpine:3.19
ARG BASE_IMAGE=alpine:3.20
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
Expand Down Expand Up @@ -149,4 +149,4 @@ RUN rc-update add sshd boot && \
rc-update add cgroups sysinit && \
rc-update add ntpd boot && \
rc-update add crond && \
rc-update add fail2ban
rc-update add fail2ban
2 changes: 1 addition & 1 deletion images/Dockerfile.kairos-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG FAMILY=alpine
ARG FLAVOR
ARG FLAVOR_RELEASE
ARG MODEL=generic
ARG BASE_IMAGE=alpine:3.19
ARG BASE_IMAGE=alpine:3.20
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
Expand Down
Loading