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

Commit 7d326d0

Browse files
Bot Updating Templated Files
1 parent 7933d12 commit 7d326d0

File tree

5 files changed

+32
-14
lines changed

5 files changed

+32
-14
lines changed

Diff for: .editorconfig

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file is globally distributed to all container image projects from
2+
# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
3+
4+
# top-most EditorConfig file
5+
root = true
6+
7+
# Unix-style newlines with a newline ending every file
8+
[*]
9+
end_of_line = lf
10+
insert_final_newline = true
11+
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
12+
trim_trailing_whitespace = false
13+
14+
[{Dockerfile*,**.yml}]
15+
indent_style = space
16+
indent_size = 2
17+
18+
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
19+
indent_style = space
20+
indent_size = 4

Diff for: .github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
66
* Read, and fill the Pull Request template
7-
* If this is a fix for a typo in code or documentation in the README please file an issue
7+
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
88
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
99
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
1010

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<!--- Before submitting a pull request please check the following -->
88

9-
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
9+
<!--- If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR -->
1010
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
1111
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
1212
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->

Diff for: .github/workflows/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/stale@v1
13+
- uses: actions/stale@v3
1414
with:
1515
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
1616
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."

Diff for: README.md

+9-11
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Find us at:
3333
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nntp2nntp.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nntp2nntp/releases)
3434
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-nntp2nntp/packages)
3535
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-nntp2nntp/container_registry)
36-
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/nntp2nntp.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/nntp2nntp "Get your own version badge on microbadger.com")
36+
[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/nntp2nntp)
3737
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nntp2nntp.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/nntp2nntp)
3838
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nntp2nntp.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/nntp2nntp)
3939
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-nntp2nntp%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nntp2nntp/job/master/)
@@ -50,7 +50,7 @@ Whilst we know of no nntp2nntp security issues the [upstream code](https://githu
5050

5151
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
5252

53-
Simply pulling `ghcr.io/linuxserver/nntp2nntp` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
53+
Simply pulling `lscr.io/linuxserver/nntp2nntp` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
5454

5555
The architectures supported by this image are:
5656

@@ -79,16 +79,14 @@ Dave = 5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
7979

8080
Here are some example snippets to help you get started creating a container.
8181

82-
### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
83-
84-
Compatible with docker-compose v2 schemas.
82+
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
8583

8684
```yaml
8785
---
8886
version: "2.1"
8987
services:
9088
nntp2nntp:
91-
image: ghcr.io/linuxserver/nntp2nntp
89+
image: lscr.io/linuxserver/nntp2nntp
9290
container_name: nntp2nntp
9391
environment:
9492
- PUID=1000
@@ -103,7 +101,7 @@ services:
103101
restart: unless-stopped
104102
```
105103
106-
### docker cli
104+
### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
107105
108106
```bash
109107
docker run -d \
@@ -116,7 +114,7 @@ docker run -d \
116114
-p 1563:1563 \
117115
-v <path to data>:/config \
118116
--restart unless-stopped \
119-
ghcr.io/linuxserver/nntp2nntp
117+
lscr.io/linuxserver/nntp2nntp
120118
```
121119

122120
## Parameters
@@ -176,7 +174,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
176174
* container version number
177175
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' nntp2nntp`
178176
* image version number
179-
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/nntp2nntp`
177+
* `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nntp2nntp`
180178

181179
## Updating Info
182180

@@ -194,7 +192,7 @@ Below are the instructions for updating containers:
194192

195193
### Via Docker Run
196194

197-
* Update the image: `docker pull ghcr.io/linuxserver/nntp2nntp`
195+
* Update the image: `docker pull lscr.io/linuxserver/nntp2nntp`
198196
* Stop the running container: `docker stop nntp2nntp`
199197
* Delete the container: `docker rm nntp2nntp`
200198
* 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)
@@ -229,7 +227,7 @@ cd docker-nntp2nntp
229227
docker build \
230228
--no-cache \
231229
--pull \
232-
-t ghcr.io/linuxserver/nntp2nntp:latest .
230+
-t lscr.io/linuxserver/nntp2nntp:latest .
233231
```
234232

235233
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`

0 commit comments

Comments
 (0)