diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index df81952..d36c173 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -111,7 +111,7 @@ jobs: exit 0 else assets=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url') - if grep -q "BambuStudio_ubuntu-24.04" <<< "${assets}"; then + if grep -q "BambuStudio_ubuntu24.04" <<< "${assets}"; then artifacts_found="true" else artifacts_found="false" diff --git a/Dockerfile b/Dockerfile index f28da5c..1ff010c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble +FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute # set version label ARG BUILD_DATE @@ -40,7 +40,7 @@ RUN \ RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases" \ | awk '/url/{print $4;exit}' FS='[""]') && \ DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" \ - | awk '/browser_download_url.*ubuntu-24.04/{print $4;exit}' FS='[""]') && \ + | awk '/browser_download_url.*ubuntu24.04/{print $4;exit}' FS='[""]') && \ cd /tmp && \ curl -o \ /tmp/bambu.app -L \ diff --git a/README.md b/README.md index 1ca132e..883342b 100644 --- a/README.md +++ b/README.md @@ -642,6 +642,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **29.04.26:** - Rebase to resolute. * **11.04.26:** - Ingest from pre-release, make Wayland default disable with PIXELFLUX_WAYLAND=false. * **28.12.25:** - Add Wayland init logic. * **31.08.25:** - Update AppImage ingestion. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index de72c1f..28f3602 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -8,7 +8,7 @@ release_tag: latest ls_branch: master external_artifact_check: | assets=$(curl -u "${{ '{{' }} secrets.CR_USER {{ '}}' }}:${{ '{{' }} secrets.CR_PAT {{ '}}' }}" -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases/tags/${EXT_RELEASE}" | jq -r '.assets[].browser_download_url') - if grep -q "BambuStudio_ubuntu-24.04" <<< "${assets}"; then + if grep -q "BambuStudio_ubuntu24.04" <<< "${assets}"; then artifacts_found="true" else artifacts_found="false" diff --git a/readme-vars.yml b/readme-vars.yml index f947503..6c72617 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -109,6 +109,7 @@ init_diagram: | "bambustudio:latest" <- Base Images # changelog changelogs: + - {date: "29.04.26:", desc: "Rebase to resolute."} - {date: "11.04.26:", desc: "Ingest from pre-release, make Wayland default disable with PIXELFLUX_WAYLAND=false."} - {date: "28.12.25:", desc: "Add Wayland init logic."} - {date: "31.08.25:", desc: "Update AppImage ingestion."} diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland index 54e1f72..dc69f93 100644 --- a/root/defaults/autostart_wayland +++ b/root/defaults/autostart_wayland @@ -7,4 +7,7 @@ elif [ "${DARK_MODE}" != "true" ] && [ -f "$HOME/.config/gtk-3.0/settings.ini" ] rm -f "$HOME/.config/gtk-3.0/settings.ini" fi +gio mime x-scheme-handler/http firefox.desktop +gio mime x-scheme-handler/https firefox.desktop + /opt/bambustudio/AppRun