Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ on:

jobs:
call-workflow:
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v7.1.0
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v8b
with:
repo_owner: ${{ github.repository_owner }}
app_name: "monit"
baseimage: "alpine"
basebranch: "3.20"
basebranch: "3.23"
branch_name: main
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
5 changes: 3 additions & 2 deletions .github/workflows/call-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ on:

jobs:
call-workflow:
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v7.1.0
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v8b
with:
repo_owner: ${{ github.repository_owner }}
app_name: "monit"
release_type: "alpine"
release_url: "v3.20/main"
release_url: "v3.23/main"
release_name: "monit"
target-arch: "64"
branch_name: main
secrets:
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
5 changes: 3 additions & 2 deletions .github/workflows/call-check-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ on:

jobs:
call-workflow:
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v7.1.0
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v8b
with:
repo_owner: ${{ github.repository_owner }}
app_name: "monit"
release_type: "alpine"
release_url: "v3.20/main"
release_url: "v3.23/main"
release_name: "monit"
branch_name: main
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
14 changes: 12 additions & 2 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
name: Greetings

on: [pull_request_target, issues]
on:
pull_request:
types:
- opened
issues:
types:
- opened

permissions:
issues: write
pull-requests: write

jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v3
- uses: actions/first-interaction@v3.1.0
with:
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver-labs/docker-monit/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver-labs/docker-monit/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver-labs/docker-monit/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine:3.20
FROM ghcr.io/linuxserver/baseimage-alpine:3.23

# set version label
ARG BUILD_DATE
Expand All @@ -21,7 +21,7 @@ RUN \
python3 && \
echo "**** install monit ****" && \
if [ -z ${APP_VERSION+x} ]; then \
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:'"monit"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add -U --upgrade --no-cache \
Expand All @@ -30,7 +30,7 @@ RUN \
pip3 install -U --no-cache-dir \
pip \
wheel && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ \
apprise && \
printf "Linuxserver-Labs version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **13.04.26:** - Rebase to Alpine 3.23.
* **04.06.24:** - Rebase to Alpine 3.20.
* **17.03.24:** - Rebase to Alpine 3.19.
* **12.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
Expand Down
Loading