diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml index beddb4c..329c153 100644 --- a/.github/workflows/call-baseimage-update.yml +++ b/.github/workflows/call-baseimage-update.yml @@ -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 }} diff --git a/.github/workflows/call-build-image.yml b/.github/workflows/call-build-image.yml index 835eb06..7c0948c 100644 --- a/.github/workflows/call-build-image.yml +++ b/.github/workflows/call-build-image.yml @@ -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 }} diff --git a/.github/workflows/call-check-and-release.yml b/.github/workflows/call-check-and-release.yml index a2024d3..9a00a29 100644 --- a/.github/workflows/call-check-and-release.yml +++ b/.github/workflows/call-check-and-release.yml @@ -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 }} diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 3ede224..4579e69 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -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)!' diff --git a/Dockerfile b/Dockerfile index e583f0b..46c8cdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 \ @@ -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 ****" && \ diff --git a/README.md b/README.md index 88e5295..0a794af 100644 --- a/README.md +++ b/README.md @@ -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.