Skip to content
This repository was archived by the owner on Jun 15, 2022. It is now read-only.

Commit bc68f7a

Browse files
Bot Updating Templated Files
1 parent 741d6d7 commit bc68f7a

File tree

2 files changed

+37
-32
lines changed

2 files changed

+37
-32
lines changed

.github/CONTRIBUTING.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the
9696

9797
### Testing your changes
9898

99-
```
99+
```bash
100100
git clone https://github.com/linuxserver/docker-scrutiny.git
101101
cd docker-scrutiny
102102
docker build \
@@ -106,13 +106,14 @@ docker build \
106106
```
107107

108108
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
109-
```
109+
110+
```bash
110111
docker run --rm --privileged multiarch/qemu-user-static:register --reset
111112
```
112113

113114
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
114115

115-
## Update the chagelog
116+
## Update the changelog
116117

117118
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-scrutiny/tree/master/root), add an entry to the changelog
118119

README.md

+33-29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- DO NOT EDIT THIS FILE MANUALLY -->
2-
<!-- Please read the CONTRIBUTING.md -->
2+
<!-- Please read the https://github.com/linuxserver/docker-scrutiny/blob/master/.github/CONTRIBUTING.md -->
33

44
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
55

@@ -12,13 +12,14 @@
1212

1313
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
1414

15-
* regular and timely application updates
16-
* easy user mappings (PGID, PUID)
17-
* custom base image with s6 overlay
18-
* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
19-
* regular security updates
15+
* regular and timely application updates
16+
* easy user mappings (PGID, PUID)
17+
* custom base image with s6 overlay
18+
* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
19+
* regular security updates
2020

2121
Find us at:
22+
2223
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
2324
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
2425
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
@@ -56,6 +57,17 @@ The architectures supported by this image are:
5657
| arm64 | arm64v8-latest |
5758
| armhf | arm32v7-latest |
5859

60+
## Application Setup
61+
62+
This container can be run as an 'all-in-one' deployment or as a hub / spoke deployment. Use the environment variables `SCRUTINY_WEB` and `SCRUTINY_COLLECTOR` to control the mode of the container. Setting both to `true` will deploy the container as both a collector and the web UI - this is the simplest and most straightforward deployment approach. To make use of the hub and spoke model, run this container in "collector" mode by specifying `SCRUTINY_API_ENDPOINT`. Set this to the host that is running the API. For this to work, you will need to expose the API port directly from the container (by default this is `8080`).
63+
64+
You may need to manually enter the container to run `scrutiny-collector-metrics run` for your first job or wait until around midnight for it to kick off.
65+
66+
A fully commented example configuration yaml file can be found in the original project repository [here](https://github.com/AnalogJ/scrutiny/blob/master/example.scrutiny.yaml). Place this file in the location mounted to `/config`.
67+
68+
A note on `--cap-add` for this container:
69+
* `SYS_RAWIO` is necessary to allow smartctl permission to query your device SMART data.
70+
* `SYS_ADMIN` is required for NVMe drives as per upstream issue [#26](https://github.com/AnalogJ/scrutiny/issues/26#issuecomment-696817130).
5971

6072
## Usage
6173

@@ -96,7 +108,7 @@ services:
96108
97109
### docker cli
98110
99-
```
111+
```bash
100112
docker run -d \
101113
--name=scrutiny \
102114
--cap-add=SYS_RAWIO \
@@ -117,7 +129,6 @@ docker run -d \
117129
ghcr.io/linuxserver/scrutiny
118130
```
119131

120-
121132
## Parameters
122133

123134
Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
@@ -143,7 +154,7 @@ You can set any environment variable from a file by using a special prepend `FIL
143154

144155
As an example:
145156

146-
```
157+
```bash
147158
-e FILE__PASSWORD=/run/secrets/mysecretpassword
148159
```
149160

@@ -162,32 +173,17 @@ Ensure any volume directories on the host are owned by the same user you specify
162173

163174
In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
164175

165-
```
176+
```bash
166177
$ id username
167178
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
168179
```
169180

170-
171-
&nbsp;
172-
## Application Setup
173-
174-
This container can be run as an 'all-in-one' deployment or as a hub / spoke deployment. Use the environment variables `SCRUTINY_WEB` and `SCRUTINY_COLLECTOR` to control the mode of the container. Setting both to `true` will deploy the container as both a collector and the web UI - this is the simplest and most straightforward deployment approach. To make use of the hub and spoke model, run this container in "collector" mode by specifying `SCRUTINY_API_ENDPOINT`. Set this to the host that is running the API. For this to work, you will need to expose the API port directly from the container (by default this is `8080`).
175-
176-
You may need to manually enter the container to run `scrutiny-collector-metrics run` for your first job or wait until around midnight for it to kick off.
177-
178-
A fully commented example configuration yaml file can be found in the original project repository [here](https://github.com/AnalogJ/scrutiny/blob/master/example.scrutiny.yaml). Place this file in the location mounted to `/config`.
179-
180-
A note on `--cap-add` for this container:
181-
* `SYS_RAWIO` is necessary to allow smartctl permission to query your device SMART data.
182-
* `SYS_ADMIN` is required for NVMe drives as per upstream issue [#26](https://github.com/AnalogJ/scrutiny/issues/26#issuecomment-696817130).
183-
184-
185181
## Docker Mods
182+
186183
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=scrutiny&query=%24.mods%5B%27scrutiny%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=scrutiny "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.")
187184

188185
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above.
189186

190-
191187
## Support Info
192188

193189
* Shell access whilst the container is running: `docker exec -it scrutiny /bin/bash`
@@ -204,38 +200,45 @@ Most of our images are static, versioned, and require an image update and contai
204200
Below are the instructions for updating containers:
205201

206202
### Via Docker Compose
203+
207204
* Update all images: `docker-compose pull`
208205
* or update a single image: `docker-compose pull scrutiny`
209206
* Let compose update all containers as necessary: `docker-compose up -d`
210207
* or update a single container: `docker-compose up -d scrutiny`
211208
* You can also remove the old dangling images: `docker image prune`
212209

213210
### Via Docker Run
211+
214212
* Update the image: `docker pull ghcr.io/linuxserver/scrutiny`
215213
* Stop the running container: `docker stop scrutiny`
216214
* Delete the container: `docker rm scrutiny`
217215
* 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)
218216
* You can also remove the old dangling images: `docker image prune`
219217

220218
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
219+
221220
* Pull the latest image at its tag and replace it with the same env variables in one run:
222-
```
221+
222+
```bash
223223
docker run --rm \
224224
-v /var/run/docker.sock:/var/run/docker.sock \
225225
containrrr/watchtower \
226226
--run-once scrutiny
227227
```
228+
228229
* You can also remove the old dangling images: `docker image prune`
229230

230231
**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).
231232

232233
### Image Update Notifications - Diun (Docker Image Update Notifier)
234+
233235
* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
234236

235237
## Building locally
236238

237239
If you want to make local modifications to these images for development purposes or just to customize the logic:
238-
```
240+
241+
```bash
239242
git clone https://github.com/linuxserver/docker-scrutiny.git
240243
cd docker-scrutiny
241244
docker build \
@@ -245,7 +248,8 @@ docker build \
245248
```
246249

247250
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
248-
```
251+
252+
```bash
249253
docker run --rm --privileged multiarch/qemu-user-static:register --reset
250254
```
251255

0 commit comments

Comments
 (0)