Skip to content

Commit

Permalink
Merge pull request #50 from linuxserver/multi
Browse files Browse the repository at this point in the history
switch back to multi-threaded make, ignore beta and alpha tags
  • Loading branch information
aptalca committed Mar 26, 2024
2 parents 8390867 + 762f1b0 commit 7e2196c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 && \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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."}
Expand Down

0 comments on commit 7e2196c

Please sign in to comment.