Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
ALPINE_VERSION: 3.24.3
ALPINE_VERSION: 3.24.4
DOCKER_BUILDKIT: 1

permissions:
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "src/aports"]
path = src/aports
url = https://github.com/alpinelinux/aports.git
url = https://git.alpinelinux.org/aports.git
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ALPINE_VERSION ?= 3.24.3
ALPINE_VERSION ?= 3.24.4
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)
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,39 +41,39 @@ Only `x86_64` and `aarch64` have been tested but other architectures can also be

## Building and testing

Note that this repo includes the [Alpine aports](https://github.com/alpinelinux/aports.git) repository as a submodule. If you didn't specify the `--recursive` option when cloning this repo, then you need to initialize the submodule by running:
Note that this repo includes the [Alpine aports](https://gitlab.alpinelinux.org/alpine/aports) repository as a submodule. If you didn't specify the `--recursive` option when cloning this repo, then you need to initialize the submodule by running:

```
git submodule update --init
```

The examples show the default values for `ALPINE_VERSION=3.24.3 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`.
The examples show the default values for `ALPINE_VERSION=3.24.4 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

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.24.3
make mkimage ALPINE_VERSION=3.24.4
```

### Build the ISO

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

```
make iso ALPINE_VERSION=3.24.3 EDITION=std
make iso ALPINE_VERSION=3.24.4 EDITION=std
```

### Run the ISO with qemu

```
make run ALPINE_VERSION=3.24.3 EDITION=std
make run ALPINE_VERSION=3.24.4 EDITION=std
```

### Run the ISO with Lima

```
make lima ALPINE_VERSION=3.24.3 EDITION=std
make lima ALPINE_VERSION=3.24.4 EDITION=std
```
2 changes: 1 addition & 1 deletion src/aports
Submodule aports updated from ee9235 to 105b83
Loading