Skip to content

Commit 8ca9b3c

Browse files
Bot Updating Templated Files
1 parent 85128bb commit 8ca9b3c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ docker build \
105105
-t linuxserver/dokuwiki: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

+3-2
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-dokuwiki/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 dokuwiki** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-dokuwiki/activity/"' \n"}],
81+
"description": "**Package Check Build(s) for dokuwiki** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
8182
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
8283
fi

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ The architectures supported by this image are:
6161

6262
Upon first install go to `http://$IP:$PORT/install.php` once you have completed the setup, restart the container, login as admin and set "Use nice URLs" in the `admin/Configuration Settings` panel to `.htaccess` and tick `Use slash as namespace separator in URLs` to enable [nice URLs](https://www.dokuwiki.org/rewrite) you will find the webui at `http://$IP:$PORT/`, for more info see [Dokuwiki](https://www.dokuwiki.org/dokuwiki/)
6363

64+
6465
## Usage
6566

6667
To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -265,10 +266,10 @@ docker build \
265266
-t lscr.io/linuxserver/dokuwiki:latest .
266267
```
267268

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

270271
```bash
271-
docker run --rm --privileged multiarch/qemu-user-static:register --reset
272+
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
272273
```
273274

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

0 commit comments

Comments
 (0)