Skip to content

Commit 0634b50

Browse files
authored
Merge pull request #10 from linuxserver-labs/3.19
Rebase to 3.19
2 parents 18cf4ba + b71361d commit 0634b50

File tree

5 files changed

+15
-32
lines changed

5 files changed

+15
-32
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.17"
15+
basebranch: "3.19"
1616
secrets:
1717
repo_release_token: ${{ secrets.repo_release_token }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build Image On Release
33
on:
44
release:
55
types: [ published ]
6-
pull_request:
6+
pull_request:
77

88
jobs:
99
call-workflow:
@@ -12,8 +12,8 @@ jobs:
1212
repo_owner: ${{ github.repository_owner }}
1313
app_name: "monit"
1414
release_type: "alpine"
15-
release_url: "v3.17/main"
15+
release_url: "v3.19/main"
1616
release_name: "monit"
17-
target-arch: "all"
17+
target-arch: "64"
1818
secrets:
1919
scarf_token: ${{ secrets.SCARF_TOKEN }}

.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.17/main"
15+
release_url: "v3.19/main"
1616
release_name: "monit"
1717
secrets:
1818
repo_release_token: ${{ secrets.repo_release_token }}

Dockerfile

Lines changed: 8 additions & 10 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.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -12,27 +12,25 @@ LABEL maintainer="thespad"
1212
RUN \
1313
echo "**** install packages ****" && \
1414
apk add --update --no-cache --virtual=build-dependencies \
15-
gcc \
16-
musl-dev \
15+
build-base \
1716
python3-dev \
1817
libffi-dev \
1918
openssl-dev \
2019
cargo && \
2120
apk add -U --upgrade --no-cache \
22-
python3 \
23-
py3-pip && \
21+
python3 && \
2422
echo "**** install monit ****" && \
25-
if [ -z ${APP_VERSION+x} ]; then \
26-
APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
23+
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 \
2725
&& awk '/^P:'"monit"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
28-
fi && \
26+
fi && \
2927
apk add -U --upgrade --no-cache \
3028
monit==${APP_VERSION} && \
31-
python3 -m ensurepip && \
29+
python3 -m venv /lsiopy && \
3230
pip3 install -U --no-cache-dir \
3331
pip \
3432
wheel && \
35-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
33+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
3634
apprise && \
3735
apk del --purge \
3836
build-dependencies && \

README.md

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The architectures supported by this image are:
5050
| :----: | :----: | ---- |
5151
| x86-64 || latest |
5252
| arm64 || latest |
53-
| armhf | | latest |
53+
| armhf | | latest |
5454

5555
## Application Setup
5656

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

7171
```yaml
7272
---
73-
version: "2.1"
7473
services:
7574
monit:
7675
image: lscr.io/linuxserver-labs/monit:latest
@@ -182,21 +181,6 @@ Below are the instructions for updating containers:
182181
* 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)
183182
* You can also remove the old dangling images: `docker image prune`
184183

185-
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
186-
187-
* Pull the latest image at its tag and replace it with the same env variables in one run:
188-
189-
```bash
190-
docker run --rm \
191-
-v /var/run/docker.sock:/var/run/docker.sock \
192-
containrrr/watchtower \
193-
--run-once monit
194-
```
195-
196-
* You can also remove the old dangling images: `docker image prune`
197-
198-
**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).
199-
200184
### Image Update Notifications - Diun (Docker Image Update Notifier)
201185

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

225209
## Versions
226210

211+
* **17.03.24:** - Rebase to Alpine 3.19.
227212
* **12.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
228213
* **10.01.22:** - Rebase to Alpine 3.15.
229214
* **20.10.21:** - Initial release.

0 commit comments

Comments
 (0)