Skip to content

Commit f31943a

Browse files
authored
Merge pull request #14 from linuxserver-labs/3.20
Rebase to 3.20
2 parents 1de93d8 + c0890fa commit f31943a

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

.github/workflows/call-baseimage-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "monit"
1414
baseimage: "alpine"
15-
basebranch: "3.19"
15+
basebranch: "3.20"
1616
secrets:
1717
repo_release_token: ${{ secrets.repo_release_token }}

.github/workflows/call-build-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
repo_owner: ${{ github.repository_owner }}
1414
app_name: "monit"
1515
release_type: "alpine"
16-
release_url: "v3.19/main"
16+
release_url: "v3.20/main"
1717
release_name: "monit"
1818
target-arch: "64"
1919
secrets:

.github/workflows/call-check-and-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "monit"
1414
release_type: "alpine"
15-
release_url: "v3.19/main"
15+
release_url: "v3.20/main"
1616
release_name: "monit"
1717
secrets:
1818
repo_release_token: ${{ secrets.repo_release_token }}

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
44

55
# set version label
66
ARG BUILD_DATE
@@ -21,7 +21,7 @@ RUN \
2121
python3 && \
2222
echo "**** install monit ****" && \
2323
if [ -z ${APP_VERSION+x} ]; then \
24-
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
24+
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
2525
&& awk '/^P:'"monit"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
2626
fi && \
2727
apk add -U --upgrade --no-cache \
@@ -30,8 +30,10 @@ RUN \
3030
pip3 install -U --no-cache-dir \
3131
pip \
3232
wheel && \
33-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
33+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
3434
apprise && \
35+
printf "Linuxserver-Labs version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
36+
echo "**** cleanup ****" && \
3537
apk del --purge \
3638
build-dependencies && \
3739
rm -rf \

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Find us at:
3131

3232
# [linuxserver-labs/monit](https://github.com/linuxserver-labs/docker-monit)
3333

34-
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver-labs%2Fmonit?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver-labs%2Fmonit)
34+
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver-labs%2Fmonit?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
3535
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver-labs/docker-monit.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-monit)
3636
[![GitHub Release](https://img.shields.io/github/release/linuxserver-labs/docker-monit.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-monit/releases)
3737
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver-labs/docker-monit/packages)
@@ -208,6 +208,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
208208

209209
## Versions
210210

211+
* **04.06.24:** - Rebase to Alpine 3.20.
211212
* **17.03.24:** - Rebase to Alpine 3.19.
212213
* **12.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
213214
* **10.01.22:** - Rebase to Alpine 3.15.

0 commit comments

Comments
 (0)