Merge pull request #142 from jandubois/bump-3.23

Bump Alpine version 3.22.2 → 3.23.0

Author: AkihiroSuda

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  ALPINE_VERSION: 3.22.2
+  ALPINE_VERSION: 3.23.0
   DOCKER_BUILDKIT: 1
 
 jobs:

Dockerfile

@@ -19,5 +19,7 @@ RUN abuild-keygen -i -a -n
 RUN apk update
 
 ADD src/aports /home/build/aports
+# Remove --no-chown which is deprecated in apk 3.0 as alias for --usermode (disallowed as root)
+RUN sed -i 's/--initdb --no-chown/--initdb/' /home/build/aports/scripts/mkimage.sh
 WORKDIR /home/build/aports/scripts
 ENTRYPOINT ["sh", "./mkimage.sh"]

Makefile

@@ -1,4 +1,4 @@
-ALPINE_VERSION ?= 3.22.2
+ALPINE_VERSION ?= 3.23.0
 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)

README.md

@@ -47,33 +47,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.22.2 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`.
+The examples show the default values for `ALPINE_VERSION=3.23.0 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.22.2
+make mkimage ALPINE_VERSION=3.23.0
 ```
 
 ### 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.22.2 EDITION=std
+make iso ALPINE_VERSION=3.23.0 EDITION=std
 ```
 
 ### Run the ISO with qemu
 
 ```
-make run ALPINE_VERSION=3.22.2 EDITION=std
+make run ALPINE_VERSION=3.23.0 EDITION=std
 ```
 
 ### Run the ISO with Lima
 
 ```
-make lima ALPINE_VERSION=3.22.2 EDITION=std
+make lima ALPINE_VERSION=3.23.0 EDITION=std
 ```

build.sh

@@ -27,7 +27,6 @@ ${DOCKER} run --rm \
     --tag "${TAG}" \
     --outdir /iso \
     --arch "${ARCH}" \
-    --repository "/home/build/packages/lima" \
     --repository "http://dl-cdn.alpinelinux.org/alpine/${REPO_VERSION}/main" \
     --repository "http://dl-cdn.alpinelinux.org/alpine/${REPO_VERSION}/community" \
     --profile lima