Skip to content

Commit b0a4721

Browse files
authored
Merge pull request #21 from linuxserver-labs/actions
2 parents c0036ec + 0ae3756 commit b0a4721

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v7.1.0
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-baseimage-update.yml@v8b
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "monit"
1414
baseimage: "alpine"
15-
basebranch: "3.20"
15+
basebranch: "3.23"
16+
branch_name: main
1617
secrets:
1718
repo_release_token: ${{ secrets.repo_release_token }}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ on:
88

99
jobs:
1010
call-workflow:
11-
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v7.1.0
11+
uses: linuxserver-labs/docker-actions/.github/workflows/build-image.yml@v8b
1212
with:
1313
repo_owner: ${{ github.repository_owner }}
1414
app_name: "monit"
1515
release_type: "alpine"
16-
release_url: "v3.20/main"
16+
release_url: "v3.23/main"
1717
release_name: "monit"
1818
target-arch: "64"
19+
branch_name: main
1920
secrets:
2021
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ on:
77

88
jobs:
99
call-workflow:
10-
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v7.1.0
10+
uses: linuxserver-labs/docker-actions/.github/workflows/check-and-release.yml@v8b
1111
with:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "monit"
1414
release_type: "alpine"
15-
release_url: "v3.20/main"
15+
release_url: "v3.23/main"
1616
release_name: "monit"
17+
branch_name: main
1718
secrets:
1819
repo_release_token: ${{ secrets.repo_release_token }}

.github/workflows/greetings.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
name: Greetings
22

3-
on: [pull_request_target, issues]
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
issues:
8+
types:
9+
- opened
10+
11+
permissions:
12+
issues: write
13+
pull-requests: write
414

515
jobs:
616
greeting:
717
runs-on: ubuntu-latest
818
steps:
9-
- uses: actions/first-interaction@v3
19+
- uses: actions/first-interaction@v3.1.0
1020
with:
1121
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!'
1222
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)!'

Dockerfile

Lines changed: 3 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.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.23
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.20/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
24+
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.23/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,7 +30,7 @@ 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.20/ \
33+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ \
3434
apprise && \
3535
printf "Linuxserver-Labs version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3636
echo "**** cleanup ****" && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
208208

209209
## Versions
210210

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

0 commit comments

Comments
 (0)