From 2797c38cfdeb8ecdf494d5a569aaab302758d638 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 14 Aug 2025 09:42:36 -0400 Subject: [PATCH 1/2] rebase to noble ingest real firefox from xtradeb --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 14 ++++++++++---- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + root/defaults/menu.xml | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 6ed12fa..5cc0d9f 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 "Bambu_Studio_linux_fedora" <<< "${assets}"; then + if grep -q "Bambu_Studio_linux_ubuntu-24.04" <<< "${assets}"; then artifacts_found="true" else artifacts_found="false" diff --git a/Dockerfile b/Dockerfile index fe0261d..9dbbd39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm +FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble # set version label ARG BUILD_DATE @@ -19,10 +19,16 @@ RUN \ /usr/share/selkies/www/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bambustudio-logo.png && \ echo "**** install packages ****" && \ + apt-key adv \ + --keyserver hkp://keyserver.ubuntu.com:80 \ + --recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \ + echo \ + "deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \ + /etc/apt/sources.list.d/xtradeb.list && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ - firefox-esr \ + firefox \ fonts-dejavu \ fonts-dejavu-extra \ gir1.2-gst-plugins-bad-1.0 \ @@ -31,7 +37,7 @@ RUN \ gstreamer1.0-plugins-* \ gstreamer1.0-pulseaudio \ libosmesa6 \ - libwebkit2gtk-4.0-37 \ + libwebkit2gtk-4.1-0 \ libwx-perl && \ echo "**** install bambu studio from appimage ****" && \ if [ -z ${BAMBUSTUDIO_VERSION+x} ]; then \ @@ -39,7 +45,7 @@ RUN \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ RELEASE_URL=$(curl -sX GET "https://api.github.com/repos/bambulab/BambuStudio/releases/latest" | awk '/url/{print $4;exit}' FS='[""]') && \ - DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" | awk '/browser_download_url.*fedora/{print $4;exit}' FS='[""]') && \ + DOWNLOAD_URL=$(curl -sX GET "${RELEASE_URL}" | awk '/browser_download_url.*24.04/{print $4;exit}' FS='[""]') && \ cd /tmp && \ curl -o \ /tmp/bambu.app -L \ diff --git a/README.md b/README.md index 84b1d91..1c9dc57 100644 --- a/README.md +++ b/README.md @@ -428,6 +428,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.08.25:** - Rebase to Ubuntu Noble to ingest approved appimage. * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED. * **29.07.24:** - Add required fonts and environment variable for dark mode. * **10.02.24:** - Update Readme with new env vars. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 186b450..21f3c3e 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 "Bambu_Studio_linux_fedora" <<< "${assets}"; then + if grep -q "Bambu_Studio_linux_ubuntu-24.04" <<< "${assets}"; then artifacts_found="true" else artifacts_found="false" diff --git a/readme-vars.yml b/readme-vars.yml index afaf7af..a20ab8e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,6 +104,7 @@ init_diagram: | "bambustudio:latest" <- Base Images # changelog changelogs: + - {date: "14.08.25:", desc: "Rebase to Ubuntu Noble to ingest approved appimage."} - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."} - {date: "29.07.24:", desc: "Add required fonts and environment variable for dark mode."} - {date: "10.02.24:", desc: "Update Readme with new env vars."} diff --git a/root/defaults/menu.xml b/root/defaults/menu.xml index 0ca5ca1..a9513ce 100644 --- a/root/defaults/menu.xml +++ b/root/defaults/menu.xml @@ -2,7 +2,7 @@ /usr/bin/xterm -/usr/bin/firefox +/usr/bin/firefox /opt/bambustudio/AppRun From c447a4d17bb30176bbba93eb2253ec7aaa27afc2 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 14 Aug 2025 11:50:54 -0400 Subject: [PATCH 2/2] use add-apt-repository for ppa ingestion --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9dbbd39..0b9a865 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,12 +19,7 @@ RUN \ /usr/share/selkies/www/icon.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bambustudio-logo.png && \ echo "**** install packages ****" && \ - apt-key adv \ - --keyserver hkp://keyserver.ubuntu.com:80 \ - --recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \ - echo \ - "deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \ - /etc/apt/sources.list.d/xtradeb.list && \ + add-apt-repository ppa:xtradeb/apps && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \