Skip to content

Commit b7edfaf

Browse files
committed
Merge tag 'v0.2.45' into alpine-3.22
Bump Alpine version 3.21.3 → 3.22.2 Signed-off-by: Jan Dubois <jan.dubois@suse.com>
2 parents 7de9017 + 5db0606 commit b7edfaf

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ALPINE_VERSION ?= 3.21.3
1+
ALPINE_VERSION ?= 3.22.2
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
@@ -51,33 +51,33 @@ Note that this repo includes the [Alpine aports](https://github.com/alpinelinux/
5151
git submodule update --init
5252
```
5353

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

5757
### Build the builder
5858

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

6161
```
62-
make mkimage ALPINE_VERSION=3.21.3
62+
make mkimage ALPINE_VERSION=3.22.2
6363
```
6464

6565
### Build the ISO
6666

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

6969
```
70-
make iso ALPINE_VERSION=3.21.3 EDITION=std
70+
make iso ALPINE_VERSION=3.22.2 EDITION=std
7171
```
7272

7373
### Run the ISO with qemu
7474

7575
```
76-
make run ALPINE_VERSION=3.21.3 EDITION=std
76+
make run ALPINE_VERSION=3.22.2 EDITION=std
7777
```
7878

7979
### Run the ISO with Lima
8080

8181
```
82-
make lima ALPINE_VERSION=3.21.3 EDITION=std
82+
make lima ALPINE_VERSION=3.22.2 EDITION=std
8383
```

0 commit comments

Comments
 (0)