diff --git a/Dockerfile b/Dockerfile index 96861d6..b00e45d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,8 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage # package version ARG ZNC_RELEASE +ENV MAKEFLAGS="-j4" + RUN \ echo "**** install build packages ****" && \ apk add -U --update --no-cache \ @@ -33,7 +35,7 @@ RUN \ echo "**** compile znc ****" && \ if [ -z ${ZNC_RELEASE+x} ]; then \ ZNC_RELEASE=$(curl -s https://api.github.com/repos/znc/znc/tags \ - | jq -r 'first(.[] | select(.name | contains("-rc") | not)) | .name'); \ + | jq -r 'first(.[] | select(.name | test("-rc|-beta|-alpha") | not)) | .name'); \ fi && \ mkdir -p \ /tmp/znc && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3d2e499..385b3ba 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -6,6 +6,8 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage # package version ARG ZNC_RELEASE +ENV MAKEFLAGS="-j4" + RUN \ apk add -U --update --no-cache \ argon2-dev \ @@ -32,7 +34,7 @@ RUN \ echo "**** compile znc ****" && \ if [ -z ${ZNC_RELEASE+x} ]; then \ ZNC_RELEASE=$(curl -s https://api.github.com/repos/znc/znc/tags \ - | jq -r 'first(.[] | select(.name | contains("-rc") | not)) | .name'); \ + | jq -r 'first(.[] | select(.name | test("-rc|-beta|-alpha") | not)) | .name'); \ fi && \ mkdir -p \ /tmp/znc && \ diff --git a/README.md b/README.md index 7aff2e6..1f4c281 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.03.24:** - Switch back to multi-threaded builds and ignore `-beta` and `-alpha` tags as well as `-rc`. * **22.02.24:** - Update build system for v1.9.0 (use cmake). * **23.12.23:** - Rebase to Alpine 3.19. * **12.07.23:** - Rebasing to Alpine 3.18. diff --git a/readme-vars.yml b/readme-vars.yml index 6bd4a39..6ba784a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,6 +45,7 @@ app_setup_block: | `change password ASAP.` # changelog changelogs: + - {date: "26.03.24:", desc: "Switch back to multi-threaded builds and ignore `-beta` and `-alpha` tags as well as `-rc`."} - {date: "22.02.24:", desc: "Update build system for v1.9.0 (use cmake)."} - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "12.07.23:", desc: "Rebasing to Alpine 3.18."}