Skip to content

Switch to Github latest release #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Switch to Github latest release #7

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
629f88e
switch to github release
tinuva May 13, 2025
bda89d7
update jenkins vars to match release type github
tinuva May 13, 2025
ad51b92
exclyde zsync assets for older freecad releases
tinuva May 13, 2025
0c9530f
update jenkins vars to use latest release version from github for tes…
tinuva May 13, 2025
ba33649
fix ext trigger workflow to use github release version
tinuva May 13, 2025
2a9e1ad
update jenkins to source ext_release from github
tinuva May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,24 @@ 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 " && \
if [ -z ${FREECAD_VERSION+x} ]; then \
FREECAD_URL=$(curl -sX GET "https://api.github.com/repos/FreeCAD/FreeCAD/releases/latest" | jq -r '.assets[] | select(.name | contains("Linux") and contains("x86_64")) | select(.name | contains("SHA256") | not) | .browser_download_url'); \
else \
ASSETS_URL=$(curl -sX GET "https://api.github.com/repos/FreeCAD/FreeCAD/releases/tags/${FREECAD_VERSION}" | jq -r '.assets_url'); \
FREECAD_URL=$(curl -sX GET "$ASSETS_URL" | jq -r '.[] | select(.name | contains("Linux") and contains("x86_64") and (contains("SHA256") | not) and (contains(".zsync") | not)) | .browser_download_url'); \
fi && \
echo "Downloading FreeCAD from: ${FREECAD_URL}" && \
cd /tmp && \
curl -o /tmp/freecad.app -L ${FREECAD_URL} && \
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|</applications>| <application title="FreeCAD*" type="normal">\n <maximized>yes</maximized>\n </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
echo "**** cleanup ****" && \
apt-get autoclean && \
rm -rf \
Expand Down
25 changes: 17 additions & 8 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,23 @@ 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 " && \
if [ -z ${FREECAD_VERSION+x} ]; then \
FREECAD_URL=$(curl -sX GET "https://api.github.com/repos/FreeCAD/FreeCAD/releases/latest" | jq -r '.assets[] | select(.name | contains("Linux") and contains("aarch64")) | select(.name | contains("SHA256") | not) | .browser_download_url'); \
else \
ASSETS_URL=$(curl -sX GET "https://api.github.com/repos/FreeCAD/FreeCAD/releases/tags/${FREECAD_VERSION}" | jq -r '.assets_url'); \
FREECAD_URL=$(curl -sX GET "$ASSETS_URL" | jq -r '.[] | select(.name | contains("Linux") and contains("aarch64") and (contains("SHA256") | not) and (contains(".zsync") | not)) | .browser_download_url'); \
fi && \
echo "Downloading FreeCAD from: ${FREECAD_URL}" && \
cd /tmp && \
curl -o /tmp/freecad.app -L ${FREECAD_URL} && \
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|</applications>| <application title="FreeCAD*" type="normal">\n <maximized>yes</maximized>\n </application>\n</applications>|' /etc/xdg/openbox/rc.xml && \
echo "**** cleanup ****" && \
apt-get autoclean && \
Expand Down
3 changes: 1 addition & 2 deletions jenkins-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

# jenkins variables
project_name: docker-freecad
external_type: na
custom_version_command: "curl -sX GET https://ftp.debian.org/debian/dists/bookworm/main/binary-amd64/Packages.gz | gunzip |grep -A 7 -m 1 'Package: freecad' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '+' '{print $1}'"
external_type: github_stable
release_type: stable
release_tag: latest
ls_branch: master
Expand Down