From 40dd3f80750e0272f2caa5b8ad66ae35951bfe93 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sat, 9 Nov 2024 17:54:58 -0500 Subject: [PATCH] update upstream org/repo, update templates --- .github/CONTRIBUTING.md | 4 ++-- .github/workflows/external_trigger.yml | 2 +- .github/workflows/package_trigger_scheduler.yml | 5 +++-- Dockerfile | 4 ++-- Jenkinsfile | 6 +++--- README.md | 5 +++-- jenkins-vars.yml | 4 ++-- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0902c51..cb6f9f3 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -105,10 +105,10 @@ docker build \ -t linuxserver/yaak:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 1be047b..14471d5 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -23,7 +23,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of main branch. To disable this trigger, add \`yaak_main\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/yaakapp/app/releases/latest" | jq -r '. | .tag_name') + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/OctoputApp/Yaak/releases/latest" | jq -r '. | .tag_name') echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 54c4b37..cfd9fff 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -70,13 +70,14 @@ jobs: if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then if [[ -n "${triggered_branches}" ]]; then NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-yaak/activity/ \n" + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" fi if [[ -n "${skipped_branches}" ]]; then NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" fi - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" echo "**** Notifying Discord ****" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for yaak** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-yaak/activity/"' \n"}], + "description": "**Package Check Build(s) for yaak** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} fi diff --git a/Dockerfile b/Dockerfile index dcdc3a4..bde5db9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,13 +21,13 @@ RUN \ echo "**** install yaak ****" && \ apt-get update && \ if [ -z ${YAAK_RELEASE+x} ]; then \ - YAAK_RELEASE=$(curl -sX GET "https://api.github.com/repos/yaakapp/app/releases/latest" \ + YAAK_RELEASE=$(curl -sX GET "https://api.github.com/repos/octoputapp/yaak/releases/latest" \ | jq -r .tag_name); \ fi && \ YAAK_VERSION=$(echo "${YAAK_RELEASE}" | sed 's|^v||') && \ curl -o \ /tmp/yaak.deb -L \ - "https://github.com/yaakapp/app/releases/download/v${YAAK_VERSION}/yaak_${YAAK_VERSION}_amd64.deb" && \ + "https://github.com/octoputapp/yaak/releases/download/v${YAAK_VERSION}/yaak_${YAAK_VERSION}_amd64.deb" && \ apt-get install -y --no-install-recommends \ /tmp/yaak.deb && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ diff --git a/Jenkinsfile b/Jenkinsfile index 679ddc1..bf62817 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,8 +20,8 @@ pipeline { QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') EXT_GIT_BRANCH = 'master' - EXT_USER = 'yaakapp' - EXT_REPO = 'app' + EXT_USER = 'OctoputApp' + EXT_REPO = 'Yaak' BUILD_VERSION_ARG = 'YAAK_RELEASE' LS_USER = 'linuxserver' LS_REPO = 'docker-yaak' @@ -894,7 +894,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "main",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' diff --git a/README.md b/README.md index c5d1383..42a6879 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ The web interface has the option for "IME Input Mode" in Settings which will all This container is capable of delivering a true lossless image at a high framerate to your web browser by changing the Stream Quality preset to "Lossless", more information [here](https://www.kasmweb.com/docs/latest/how_to/lossless.html#technical-background). In order to use this mode from a non localhost endpoint the HTTPS port on 8181 needs to be used. If using a reverse proxy to port 8080 specific headers will need to be set as outlined [here](https://github.com/linuxserver/docker-baseimage-kasmvnc#lossless). + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -316,10 +317,10 @@ docker build \ -t lscr.io/linuxserver/yaak:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index d18c098..d193a64 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -9,8 +9,8 @@ ls_branch: main build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - - EXT_USER = 'yaakapp' - - EXT_REPO = 'app' + - EXT_USER = 'OctoputApp' + - EXT_REPO = 'Yaak' - BUILD_VERSION_ARG = 'YAAK_RELEASE' - LS_USER = 'linuxserver' - LS_REPO = 'docker-yaak'