diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 535a29b..745d053 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: pull_request: env: - ALPINE_VERSION: 3.13.5 + ALPINE_VERSION: 3.14.3 DOCKER_BUILDKIT: 1 jobs: diff --git a/Makefile b/Makefile index 9302226..239f1d4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ALPINE_VERSION ?= 3.13.5 +ALPINE_VERSION ?= 3.14.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 f2804a4..a395f2f 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,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.13.5 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`. +The examples show the default values for `ALPINE_VERSION=3.14.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 @@ -59,7 +59,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.13.5 +make mkimage ALPINE_VERSION=3.14.3 ``` ### Build the ISO @@ -67,17 +67,17 @@ make mkimage ALPINE_VERSION=3.13.5 This docker image can then be used to create ISO images that will be stored under `./iso`: ``` -make iso ALPINE_VERSION=3.13.5 EDITION=std +make iso ALPINE_VERSION=3.14.3 EDITION=std ``` ### Run the ISO with qemu ``` -make run ALPINE_VERSION=3.13.5 EDITION=std +make run ALPINE_VERSION=3.14.3 EDITION=std ``` ### Run the ISO with Lima ``` -make lima ALPINE_VERSION=3.13.5 EDITION=std +make lima ALPINE_VERSION=3.14.3 EDITION=std ``` diff --git a/src/aports b/src/aports index 5bcff43..f1a5664 160000 --- a/src/aports +++ b/src/aports @@ -1 +1 @@ -Subproject commit 5bcff43ec5915daefb2c17b8e2ea86cf48dfff80 +Subproject commit f1a5664f9f754c7898d4a411ffeff7a156457678