Skip to content

Rebase to 3.19 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/call-baseimage-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
repo_owner: ${{ github.repository_owner }}
app_name: "monit"
baseimage: "alpine"
basebranch: "3.17"
basebranch: "3.19"
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
6 changes: 3 additions & 3 deletions .github/workflows/call-build-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build Image On Release
on:
release:
types: [ published ]
pull_request:
pull_request:

jobs:
call-workflow:
Expand All @@ -12,8 +12,8 @@ jobs:
repo_owner: ${{ github.repository_owner }}
app_name: "monit"
release_type: "alpine"
release_url: "v3.17/main"
release_url: "v3.19/main"
release_name: "monit"
target-arch: "all"
target-arch: "64"
secrets:
scarf_token: ${{ secrets.SCARF_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/call-check-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
repo_owner: ${{ github.repository_owner }}
app_name: "monit"
release_type: "alpine"
release_url: "v3.17/main"
release_url: "v3.19/main"
release_name: "monit"
secrets:
repo_release_token: ${{ secrets.repo_release_token }}
18 changes: 8 additions & 10 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.17
FROM ghcr.io/linuxserver/baseimage-alpine:3.19

# set version label
ARG BUILD_DATE
Expand All @@ -12,27 +12,25 @@ LABEL maintainer="thespad"
RUN \
echo "**** install packages ****" && \
apk add --update --no-cache --virtual=build-dependencies \
gcc \
musl-dev \
build-base \
python3-dev \
libffi-dev \
openssl-dev \
cargo && \
apk add -U --upgrade --no-cache \
python3 \
py3-pip && \
python3 && \
echo "**** install monit ****" && \
if [ -z ${APP_VERSION+x} ]; then \
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
if [ -z ${APP_VERSION+x} ]; then \
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.19/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
&& awk '/^P:'"monit"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
fi && \
apk add -U --upgrade --no-cache \
monit==${APP_VERSION} && \
python3 -m ensurepip && \
python3 -m venv /lsiopy && \
pip3 install -U --no-cache-dir \
pip \
wheel && \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
apprise && \
apk del --purge \
build-dependencies && \
Expand Down
19 changes: 2 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The architectures supported by this image are:
| :----: | :----: | ---- |
| x86-64 | ✅ | latest |
| arm64 | ✅ | latest |
| armhf | | latest |
| armhf | | latest |

## Application Setup

Expand All @@ -70,7 +70,6 @@ Here are some example snippets to help you get started creating a container.

```yaml
---
version: "2.1"
services:
monit:
image: lscr.io/linuxserver-labs/monit:latest
Expand Down Expand Up @@ -182,21 +181,6 @@ Below are the instructions for updating containers:
* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
* You can also remove the old dangling images: `docker image prune`

### Via Watchtower auto-updater (only use if you don't remember the original parameters)

* Pull the latest image at its tag and replace it with the same env variables in one run:

```bash
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
containrrr/watchtower \
--run-once monit
```

* You can also remove the old dangling images: `docker image prune`

**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).

### Image Update Notifications - Diun (Docker Image Update Notifier)

* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
Expand Down Expand Up @@ -224,6 +208,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **17.03.24:** - Rebase to Alpine 3.19.
* **12.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
* **10.01.22:** - Rebase to Alpine 3.15.
* **20.10.21:** - Initial release.
Loading