Skip to content

Commit 2c18bef

Browse files
Bot Updating Templated Files
1 parent 858d35f commit 2c18bef

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ docker build \
105105
-t linuxserver/rsnapshot:latest .
106106
```
107107

108-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
108+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
109109

110110
```bash
111-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
111+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
112112
```
113113

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

.github/workflows/package_trigger_scheduler.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,14 @@ jobs:
7070
if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
7171
if [[ -n "${triggered_branches}" ]]; then
7272
NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
73+
NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-rsnapshot/activity/ \n"
74+
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
7375
fi
7476
if [[ -n "${skipped_branches}" ]]; then
7577
NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
7678
fi
77-
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
7879
echo "**** Notifying Discord ****"
7980
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
80-
"description": "**Package Check Build(s) Triggered for rsnapshot** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-rsnapshot/activity/"' \n"}],
81+
"description": "**Package Check Build(s) for rsnapshot** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
8182
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
8283
fi

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ This can be changed in the config, but be sure you mount a volume to the contain
8282
You will then need to edit `/config/crontabs/root` to set cron jobs to run rsnapshot.
8383
By default no cron jobs are enabled. Examples are includes based on information from the [rsnapshot readme](https://github.com/rsnapshot/rsnapshot/blob/master/README.md#configuration).
8484

85+
8586
## Usage
8687

8788
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -285,10 +286,10 @@ docker build \
285286
-t lscr.io/linuxserver/rsnapshot:latest .
286287
```
287288

288-
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
289+
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
289290

290291
```bash
291-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
292+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
292293
```
293294

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

0 commit comments

Comments
 (0)