From b1dac0537f1e4df2c821b4b66bee30d51f2bdbb3 Mon Sep 17 00:00:00 2001
From: Mauro Morales <mauro.morales@spectrocloud.com>
Date: Fri, 14 Jun 2024 14:07:17 +0200
Subject: [PATCH] Bump alpine to 3.20
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
---
.github/flavors.json | 24 ++++++++++++------------
.github/workflows/image-arm-pr.yaml | 4 ++--
.github/workflows/image-pr.yaml | 18 +++++++++---------
.github/workflows/image.yaml | 18 +++++++++---------
images/Dockerfile.alpine | 4 ++--
images/Dockerfile.kairos-alpine | 2 +-
6 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/.github/flavors.json b/.github/flavors.json
index 7ea74a7c7..9b218e2e6 100644
--- a/.github/flavors.json
+++ b/.github/flavors.json
@@ -303,60 +303,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"
},
diff --git a/.github/workflows/image-arm-pr.yaml b/.github/workflows/image-arm-pr.yaml
index b9f0493c5..4424ec564 100644
--- a/.github/workflows/image-arm-pr.yaml
+++ b/.github/workflows/image-arm-pr.yaml
@@ -25,8 +25,8 @@ jobs:
uses: ./.github/workflows/reusable-docker-arm-build.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: rpi4
worker: fast
diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml
index 773b1dedc..5e181446c 100644
--- a/.github/workflows/image-pr.yaml
+++ b/.github/workflows/image-pr.yaml
@@ -36,9 +36,9 @@ jobs:
uses: ./.github/workflows/reusable-build-flavor.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
arch: amd64
@@ -76,7 +76,7 @@ jobs:
uses: ./.github/workflows/reusable-install-test.yaml
with:
flavor: alpine
- flavor_release: "3.19"
+ flavor_release: "3.20"
needs:
- core-alpine
@@ -100,7 +100,7 @@ jobs:
uses: ./.github/workflows/reusable-qemu-acceptance-test.yaml
with:
flavor: alpine
- flavor_release: "3.19"
+ flavor_release: "3.20"
needs:
- core-alpine
@@ -124,7 +124,7 @@ jobs:
uses: ./.github/workflows/reusable-qemu-reset-test.yaml
with:
flavor: alpine
- flavor_release: "3.19"
+ flavor_release: "3.20"
needs:
- core-alpine
@@ -144,9 +144,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:
@@ -164,7 +164,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
@@ -223,7 +223,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
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index 906c99ce0..5e23aedd6 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -112,7 +112,7 @@ jobs:
matrix:
include:
- flavor: "alpine"
- flavorRelease: "3.19"
+ flavorRelease: "3.20"
- flavor: "opensuse"
flavorRelease: "leap-15.6"
- flavor: "opensuse"
@@ -150,9 +150,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
@@ -177,11 +177,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
@@ -206,7 +206,7 @@ jobs:
matrix:
include:
- flavor: alpine
- flavorRelease: "3.19"
+ flavorRelease: "3.20"
- flavor: opensuse
flavorRelease: leap-15.6
releaseMatcher: leap-15.5
@@ -285,9 +285,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
@@ -323,7 +323,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
diff --git a/images/Dockerfile.alpine b/images/Dockerfile.alpine
index 40cc4e148..d00987b60 100644
--- a/images/Dockerfile.alpine
+++ b/images/Dockerfile.alpine
@@ -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
@@ -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
\ No newline at end of file
+ rc-update add fail2ban
diff --git a/images/Dockerfile.kairos-alpine b/images/Dockerfile.kairos-alpine
index ff839a8b3..0a5b94387 100644
--- a/images/Dockerfile.kairos-alpine
+++ b/images/Dockerfile.kairos-alpine
@@ -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