diff --git a/Dockerfile b/Dockerfile index ea63826..03f8968 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" @@ -13,14 +13,17 @@ 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 freecad from appimage " && \ + cd /tmp && \ + 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 && \ + 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..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" @@ -13,14 +13,16 @@ 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 freecad from appimage " && \ + cd /tmp && \ + 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 && \ + 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 && \