From 82e41778a10b681682da712e4409d3d5c00435d8 Mon Sep 17 00:00:00 2001 From: Constantin Date: Thu, 20 Feb 2025 16:51:20 +0100 Subject: [PATCH 1/5] Adjust for FreeCAD v1 release --- Dockerfile | 43 +++++++++++++++++++++++++++++++++++-------- Dockerfile.aarch64 | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index ea63826..b9361b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,14 +13,41 @@ ENV TITLE=FreeCAD RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ - https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png && \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - freecad \ - python3-pyside2.qtwebchannel \ - python3-pyside2.qtwebengine* && \ + /usr/share/icons/hicolor/48x48/apps/freecad.png \ + https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png +RUN \ +echo "**** install packages ****" && \ +apt-get update && \ +apt-get upgrade -y && \ +apt-get install -y --no-install-recommends \ + firefox-esr \ + gstreamer1.0-alsa \ + gstreamer1.0-gl \ + gstreamer1.0-gtk3 \ + gstreamer1.0-libav \ + gstreamer1.0-plugins-bad \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-ugly \ + gstreamer1.0-pulseaudio \ + gstreamer1.0-qt5 \ + gstreamer1.0-tools \ + gstreamer1.0-x \ + libgstreamer1.0 \ + libgstreamer-plugins-bad1.0 \ + libgstreamer-plugins-base1.0 \ + libwebkit2gtk-4.0-37 \ + libwx-perl +RUN \ + echo " install freecad from appimage " && \ + freecad_version="1.0.0" && \ + cd /tmp && \ + curl -o /tmp/freecad.app -L https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Linux-x86_64-py311.AppImage && \ + chmod +x /tmp/freecad.app && \ + ./freecad.app --appimage-extract && \ + mv squashfs-root /opt/freecad && \ + ln -s /opt/freecad/AppRun /usr/bin/freecad && \ + sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7dc56b4..e6f658e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,14 +13,40 @@ ENV TITLE=FreeCAD RUN \ echo "**** add icon ****" && \ curl -o \ - /kclient/public/icon.png \ - https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png && \ + /usr/share/icons/hicolor/48x48/apps/freecad.png \ + https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png +RUN \ echo "**** install packages ****" && \ apt-get update && \ + apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - freecad \ - python3-pyside2.qtwebchannel \ - python3-pyside2.qtwebengine* && \ + firefox-esr \ + gstreamer1.0-alsa \ + gstreamer1.0-gl \ + gstreamer1.0-gtk3 \ + gstreamer1.0-libav \ + gstreamer1.0-plugins-bad \ + gstreamer1.0-plugins-base \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-ugly \ + gstreamer1.0-pulseaudio \ + gstreamer1.0-qt5 \ + gstreamer1.0-tools \ + gstreamer1.0-x \ + libgstreamer1.0 \ + libgstreamer-plugins-bad1.0 \ + libgstreamer-plugins-base1.0 \ + libwebkit2gtk-4.0-37 \ + libwx-perl +RUN \ + echo " install freecad from appimage " && \ + freecad_version="1.0.0" && \ + cd /tmp && \ + curl -o /tmp/freecad.app -L https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Linux-aarch64-py311.AppImage && \ + chmod +x /tmp/freecad.app && \ + ./freecad.app --appimage-extract && \ + mv squashfs-root /opt/freecad && \ + ln -s /opt/freecad/AppRun /usr/bin/freecad && \ sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml && \ echo "**** cleanup ****" && \ apt-get autoclean && \ From 8a297560bc4c93bd93d9466ed286a4ac7347922c Mon Sep 17 00:00:00 2001 From: Constantin Date: Thu, 20 Feb 2025 17:40:53 +0100 Subject: [PATCH 2/5] remove firefox dep --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9361b4..c06394c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,6 @@ echo "**** install packages ****" && \ apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - firefox-esr \ gstreamer1.0-alsa \ gstreamer1.0-gl \ gstreamer1.0-gtk3 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e6f658e..93a9e85 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -20,7 +20,6 @@ RUN \ apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ - firefox-esr \ gstreamer1.0-alsa \ gstreamer1.0-gl \ gstreamer1.0-gtk3 \ From 724167f123d2d2131a06d829c387ddc64b30eacd Mon Sep 17 00:00:00 2001 From: Constantin Date: Fri, 21 Feb 2025 09:08:03 +0100 Subject: [PATCH 3/5] Remove unnecessary dependencies --- Dockerfile | 22 ---------------------- Dockerfile.aarch64 | 22 ---------------------- 2 files changed, 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index c06394c..ac9f1be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,28 +15,6 @@ RUN \ curl -o \ /usr/share/icons/hicolor/48x48/apps/freecad.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png -RUN \ -echo "**** install packages ****" && \ -apt-get update && \ -apt-get upgrade -y && \ -apt-get install -y --no-install-recommends \ - gstreamer1.0-alsa \ - gstreamer1.0-gl \ - gstreamer1.0-gtk3 \ - gstreamer1.0-libav \ - gstreamer1.0-plugins-bad \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good \ - gstreamer1.0-plugins-ugly \ - gstreamer1.0-pulseaudio \ - gstreamer1.0-qt5 \ - gstreamer1.0-tools \ - gstreamer1.0-x \ - libgstreamer1.0 \ - libgstreamer-plugins-bad1.0 \ - libgstreamer-plugins-base1.0 \ - libwebkit2gtk-4.0-37 \ - libwx-perl RUN \ echo " install freecad from appimage " && \ freecad_version="1.0.0" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 93a9e85..54532c4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -15,28 +15,6 @@ RUN \ curl -o \ /usr/share/icons/hicolor/48x48/apps/freecad.png \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png -RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y --no-install-recommends \ - gstreamer1.0-alsa \ - gstreamer1.0-gl \ - gstreamer1.0-gtk3 \ - gstreamer1.0-libav \ - gstreamer1.0-plugins-bad \ - gstreamer1.0-plugins-base \ - gstreamer1.0-plugins-good \ - gstreamer1.0-plugins-ugly \ - gstreamer1.0-pulseaudio \ - gstreamer1.0-qt5 \ - gstreamer1.0-tools \ - gstreamer1.0-x \ - libgstreamer1.0 \ - libgstreamer-plugins-bad1.0 \ - libgstreamer-plugins-base1.0 \ - libwebkit2gtk-4.0-37 \ - libwx-perl RUN \ echo " install freecad from appimage " && \ freecad_version="1.0.0" && \ From be8598c3e2df55c25211f2bed98fc675264152bb Mon Sep 17 00:00:00 2001 From: Constantin Date: Tue, 20 May 2025 23:08:18 +0200 Subject: [PATCH 4/5] Take FreeCAD version from build arg --- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac9f1be..d33756e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm # set version label ARG BUILD_DATE ARG VERSION -ARG FREECAD_VERSION +ARG FREECAD_VERSION="1.0.0" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" @@ -17,9 +17,8 @@ RUN \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png RUN \ echo " install freecad from appimage " && \ - freecad_version="1.0.0" && \ cd /tmp && \ - curl -o /tmp/freecad.app -L https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Linux-x86_64-py311.AppImage && \ + curl -o /tmp/freecad.app -L https://github.com/FreeCAD/FreeCAD/releases/download/${FREECAD_VERSION}/FreeCAD_${FREECAD_VERSION}-conda-Linux-x86_64-py311.AppImage && \ chmod +x /tmp/freecad.app && \ ./freecad.app --appimage-extract && \ mv squashfs-root /opt/freecad && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 54532c4..824e0b7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm # set version label ARG BUILD_DATE ARG VERSION -ARG FREECAD_VERSION +ARG FREECAD_VERSION="1.0.0" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" @@ -17,9 +17,8 @@ RUN \ https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png RUN \ echo " install freecad from appimage " && \ - freecad_version="1.0.0" && \ cd /tmp && \ - curl -o /tmp/freecad.app -L https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Linux-aarch64-py311.AppImage && \ + curl -o /tmp/freecad.app -L https://github.com/FreeCAD/FreeCAD/releases/download/${FREECAD_VERSION}/FreeCAD_${FREECAD_VERSION}-conda-Linux-aarch64-py311.AppImage && \ chmod +x /tmp/freecad.app && \ ./freecad.app --appimage-extract && \ mv squashfs-root /opt/freecad && \ From cd2aeeddd13115f4108785f144bf8c2ba6bc6966 Mon Sep 17 00:00:00 2001 From: Constantin Date: Tue, 20 May 2025 23:55:44 +0200 Subject: [PATCH 5/5] Fix indentation --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d33756e..03f8968 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ ENV TITLE=FreeCAD RUN \ echo "**** add icon ****" && \ curl -o \ - /usr/share/icons/hicolor/48x48/apps/freecad.png \ - https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png + /usr/share/icons/hicolor/48x48/apps/freecad.png \ + https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/freecad-logo.png RUN \ echo " install freecad from appimage " && \ cd /tmp && \