Skip to content
This repository was archived by the owner on Aug 25, 2023. It is now read-only.

Commit b8c7ccb

Browse files
Bot Updating Templated Files
1 parent d18c003 commit b8c7ccb

File tree

2 files changed

+40
-36
lines changed

2 files changed

+40
-36
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-nntp2nntp.git
101101
cd docker-nntp2nntp
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-nntp2nntp/tree/master/root), add an entry to the changelog
118119

README.md

+36-33
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-nntp2nntp/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.
@@ -43,7 +44,6 @@ Find us at:
4344

4445
Whilst we know of no nntp2nntp security issues the [upstream code](https://github.com/linuxserver/nntp2nntp) for this project has received no changes since 06.08.15 and is likely abandoned permanently. For this reason we strongly recommend you do not make this application public facing and if you must do so other layers of security and SSL should be considered an absolute bare minimum requirement. We see this proxy being used primarily on a LAN so that all the users NNTP applications can share a common set of internal credentials allowing for central managment of the upstream account e.g change provider, server, thread limits for all applications with one global config change.
4546

46-
4747
[![nntp2nntp](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nntp2nntp.png)](https://github.com/linuxserver/nntp2nntp)
4848

4949
## Supported Architectures
@@ -60,6 +60,20 @@ The architectures supported by this image are:
6060
| arm64 | arm64v8-latest |
6161
| armhf | arm32v6-latest |
6262

63+
## Application Setup
64+
65+
Edit sample config file `config/nntp2nntp.conf` with upstream provider details and rename the local users.
66+
67+
New user passwords can be created by running the password hash generator
68+
```
69+
docker exec -it nntp2nntp /usr/bin/nntp2nntp.py pass
70+
```
71+
entering the desired password and copying the resulting string to the relevant user line in `/config/nntp2nntp.conf`
72+
73+
Example with a user called `Dave` and with a password of `password`
74+
```
75+
Dave = 5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
76+
```
6377

6478
## Usage
6579

@@ -91,7 +105,7 @@ services:
91105
92106
### docker cli
93107
94-
```
108+
```bash
95109
docker run -d \
96110
--name=nntp2nntp \
97111
-e PUID=1000 \
@@ -105,7 +119,6 @@ docker run -d \
105119
ghcr.io/linuxserver/nntp2nntp
106120
```
107121

108-
109122
## Parameters
110123

111124
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.
@@ -126,7 +139,7 @@ You can set any environment variable from a file by using a special prepend `FIL
126139

127140
As an example:
128141

129-
```
142+
```bash
130143
-e FILE__PASSWORD=/run/secrets/mysecretpassword
131144
```
132145

@@ -145,35 +158,17 @@ Ensure any volume directories on the host are owned by the same user you specify
145158

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

148-
```
161+
```bash
149162
$ id username
150163
uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
151164
```
152165

153-
154-
&nbsp;
155-
## Application Setup
156-
157-
Edit sample config file `config/nntp2nntp.conf` with upstream provider details and rename the local users.
158-
159-
New user passwords can be created by running the password hash generator
160-
```
161-
docker exec -it nntp2nntp /usr/bin/nntp2nntp.py pass
162-
```
163-
entering the desired password and copying the resulting string to the relevant user line in `/config/nntp2nntp.conf`
164-
165-
Example with a user called `Dave` and with a password of `password`
166-
```
167-
Dave = 5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
168-
```
169-
170-
171166
## Docker Mods
167+
172168
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=nntp2nntp&query=%24.mods%5B%27nntp2nntp%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=nntp2nntp "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.")
173169

174170
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.
175171

176-
177172
## Support Info
178173

179174
* Shell access whilst the container is running: `docker exec -it nntp2nntp /bin/bash`
@@ -190,38 +185,45 @@ Most of our images are static, versioned, and require an image update and contai
190185
Below are the instructions for updating containers:
191186

192187
### Via Docker Compose
188+
193189
* Update all images: `docker-compose pull`
194190
* or update a single image: `docker-compose pull nntp2nntp`
195191
* Let compose update all containers as necessary: `docker-compose up -d`
196192
* or update a single container: `docker-compose up -d nntp2nntp`
197193
* You can also remove the old dangling images: `docker image prune`
198194

199195
### Via Docker Run
196+
200197
* Update the image: `docker pull ghcr.io/linuxserver/nntp2nntp`
201198
* Stop the running container: `docker stop nntp2nntp`
202199
* Delete the container: `docker rm nntp2nntp`
203200
* 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)
204201
* You can also remove the old dangling images: `docker image prune`
205202

206203
### Via Watchtower auto-updater (only use if you don't remember the original parameters)
204+
207205
* Pull the latest image at its tag and replace it with the same env variables in one run:
208-
```
206+
207+
```bash
209208
docker run --rm \
210209
-v /var/run/docker.sock:/var/run/docker.sock \
211210
containrrr/watchtower \
212211
--run-once nntp2nntp
213212
```
213+
214214
* You can also remove the old dangling images: `docker image prune`
215215

216216
**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).
217217

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

221222
## Building locally
222223

223224
If you want to make local modifications to these images for development purposes or just to customize the logic:
224-
```
225+
226+
```bash
225227
git clone https://github.com/linuxserver/docker-nntp2nntp.git
226228
cd docker-nntp2nntp
227229
docker build \
@@ -231,7 +233,8 @@ docker build \
231233
```
232234

233235
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
234-
```
236+
237+
```bash
235238
docker run --rm --privileged multiarch/qemu-user-static:register --reset
236239
```
237240

0 commit comments

Comments
 (0)