Skip to content

Commit 36ea08e

Browse files
authored
Merge pull request #137 from jandubois/alpine-3.21.3
Bump Alpine 3.20.3 → 3.21.3
2 parents f265173 + 38ac346 commit 36ea08e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99

1010
env:
11-
ALPINE_VERSION: 3.20.3
11+
ALPINE_VERSION: 3.21.3
1212
DOCKER_BUILDKIT: 1
1313

1414
jobs:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ALPINE_VERSION ?= 3.20.3
1+
ALPINE_VERSION ?= 3.21.3
22
REPO_VERSION ?= $(shell echo "$(ALPINE_VERSION)" | sed -E 's/^([0-9]+\.[0-9]+).*/v\1/')
33
GIT_TAG ?= $(shell echo "v$(ALPINE_VERSION)" | sed 's/^vedge$$/origin\/master/')
44
BUILD_ID ?= $(shell git describe --tags)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,33 @@ Note that this repo includes the [Alpine aports](https://github.com/alpinelinux/
4747
git submodule update --init
4848
```
4949

50-
The examples show the default values for `ALPINE_VERSION=3.20.3 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`.
50+
The examples show the default values for `ALPINE_VERSION=3.21.3 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`.
5151
The options need to be specified only to select non-default setting.
5252

5353
### Build the builder
5454

5555
The ISO builder will be created inside a docker image. You can specify the Alpine version used to create it:
5656

5757
```
58-
make mkimage ALPINE_VERSION=3.20.3
58+
make mkimage ALPINE_VERSION=3.21.3
5959
```
6060

6161
### Build the ISO
6262

6363
This docker image can then be used to create ISO images that will be stored under `./iso`:
6464

6565
```
66-
make iso ALPINE_VERSION=3.20.3 EDITION=std
66+
make iso ALPINE_VERSION=3.21.3 EDITION=std
6767
```
6868

6969
### Run the ISO with qemu
7070

7171
```
72-
make run ALPINE_VERSION=3.20.3 EDITION=std
72+
make run ALPINE_VERSION=3.21.3 EDITION=std
7373
```
7474

7575
### Run the ISO with Lima
7676

7777
```
78-
make lima ALPINE_VERSION=3.20.3 EDITION=std
78+
make lima ALPINE_VERSION=3.21.3 EDITION=std
7979
```

src/aports

Submodule aports updated 10644 files

0 commit comments

Comments
 (0)