Skip to content

Commit 41e6940

Browse files
Bot Updating Templated Files
1 parent f67ca24 commit 41e6940

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/oscam: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-oscam/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 oscam** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-oscam/activity/"' \n"}],
81+
"description": "**Package Check Build(s) for oscam** \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
@@ -62,6 +62,7 @@ The architectures supported by this image are:
6262
To set up oscam there are numerous guides on the internet. There are too many scenarios to make a quick guide.
6363
The web interface is at port 8888. You can find the project wiki [here](https://trac.streamboard.tv/oscam/).
6464

65+
6566
## Usage
6667

6768
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -289,10 +290,10 @@ docker build \
289290
-t lscr.io/linuxserver/oscam:latest .
290291
```
291292

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

294295
```bash
295-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
296+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
296297
```
297298

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

0 commit comments

Comments
 (0)