From 38ac3464d40896c7d567e8db0370caae59d27dd4 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Thu, 3 Apr 2025 10:46:10 -0700 Subject: [PATCH] =?UTF-8?q?Bump=20Alpine=203.20.3=20=E2=86=92=203.21.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan Dubois --- .github/workflows/release.yml | 2 +- Makefile | 2 +- README.md | 10 +++++----- src/aports | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ed0e86..bc7164c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: pull_request: env: - ALPINE_VERSION: 3.20.3 + ALPINE_VERSION: 3.21.3 DOCKER_BUILDKIT: 1 jobs: diff --git a/Makefile b/Makefile index 0693fe4..96284a1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ALPINE_VERSION ?= 3.20.3 +ALPINE_VERSION ?= 3.21.3 REPO_VERSION ?= $(shell echo "$(ALPINE_VERSION)" | sed -E 's/^([0-9]+\.[0-9]+).*/v\1/') GIT_TAG ?= $(shell echo "v$(ALPINE_VERSION)" | sed 's/^vedge$$/origin\/master/') BUILD_ID ?= $(shell git describe --tags) diff --git a/README.md b/README.md index 5c8258d..8213b06 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Note that this repo includes the [Alpine aports](https://github.com/alpinelinux/ git submodule update --init ``` -The examples show the default values for `ALPINE_VERSION=3.20.3 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`. +The examples show the default values for `ALPINE_VERSION=3.21.3 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`. The options need to be specified only to select non-default setting. ### Build the builder @@ -55,7 +55,7 @@ The options need to be specified only to select non-default setting. The ISO builder will be created inside a docker image. You can specify the Alpine version used to create it: ``` -make mkimage ALPINE_VERSION=3.20.3 +make mkimage ALPINE_VERSION=3.21.3 ``` ### Build the ISO @@ -63,17 +63,17 @@ make mkimage ALPINE_VERSION=3.20.3 This docker image can then be used to create ISO images that will be stored under `./iso`: ``` -make iso ALPINE_VERSION=3.20.3 EDITION=std +make iso ALPINE_VERSION=3.21.3 EDITION=std ``` ### Run the ISO with qemu ``` -make run ALPINE_VERSION=3.20.3 EDITION=std +make run ALPINE_VERSION=3.21.3 EDITION=std ``` ### Run the ISO with Lima ``` -make lima ALPINE_VERSION=3.20.3 EDITION=std +make lima ALPINE_VERSION=3.21.3 EDITION=std ``` diff --git a/src/aports b/src/aports index 095bac4..899c70c 160000 --- a/src/aports +++ b/src/aports @@ -1 +1 @@ -Subproject commit 095bac49b6e2f64f2c05f3cbfde30d86210b17e0 +Subproject commit 899c70c801638ce9aea29a822aaa07a1488efa15