Skip to content

Commit

Permalink
Merge pull request #32 from lima-vm/alpine-3.14
Browse files Browse the repository at this point in the history
Upgrade from Alpine 3.13.5 → 3.14.3
  • Loading branch information
jandubois authored Nov 23, 2021
2 parents 2cd65cf + 710676b commit bc0f3af
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
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.13.5
ALPINE_VERSION: 3.14.3
DOCKER_BUILDKIT: 1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,33 @@ 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

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

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
```
2 changes: 1 addition & 1 deletion src/aports
Submodule aports updated 6985 files

0 comments on commit bc0f3af

Please sign in to comment.