Skip to content

Commit 671b249

Browse files
Bot Updating Templated Files
1 parent eeab5e7 commit 671b249

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.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/baseimage-alpine-nginx: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/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1616
run: |
1717
printf "# External trigger for docker-baseimage-alpine-nginx\n\n" >> $GITHUB_STEP_SUMMARY
18-
if grep -wq "^baseimage-alpine-nginx_3.19$" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
18+
if grep -q "^baseimage-alpine-nginx_3.19" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
1919
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
2020
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`baseimage-alpine-nginx_3.19\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2121
exit 0

.github/workflows/package_trigger_scheduler.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3434
echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
3535
skipped_branches="${skipped_branches}${br} "
36-
elif grep -wq "^baseimage-alpine-nginx_${br}$" <<< "${SKIP_PACKAGE_TRIGGER}"; then
36+
elif grep -q "^baseimage-alpine-nginx_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
3737
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3838
echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`baseimage-alpine-nginx_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
3939
skipped_branches="${skipped_branches}${br} "
@@ -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-baseimage-alpine-nginx/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 baseimage-alpine-nginx** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-alpine-nginx/activity/"' \n"}],
81+
"description": "**Package Check Build(s) for baseimage-alpine-nginx** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
8182
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
8283
fi

0 commit comments

Comments
 (0)