Add draco and mesa-egl, bump f3d

Dockerfile

@@ -18,7 +18,7 @@ ENV RAILS_ENV="production" \
     APP_VERSION=${MANYFOLD_VERSION} \
     HOME=/config
 
-COPY --from=ruby:3.4.9-alpine3.24 /usr/local /usr/local/
+COPY --from=ruby:3.4.12-alpine3.24 /usr/local /usr/local/
 
 RUN \
   apk add --no-cache \
@@ -36,6 +36,7 @@ RUN \
     libarchive \
     libucontext \
     mariadb-connector-c \
+    mesa-egl \
     opencascade \
     openexr-libopenexr \
     pciutils \
@@ -52,12 +53,10 @@ RUN \
     npm \
     postgresql-dev \
     yaml-dev && \
-  echo "**** install manyfold F3D package ****" && \
-  curl -s -o \
-    /tmp/f3d.apk -L \
-    "https://github.com/manyfold3d/f3d-alpine/releases/download/v3.5.0-r0-1/f3d-3.5.0-r0.x86_64.apk" && \
-  apk add --no-cache --allow-untrusted /tmp/f3d.apk && \
-  rm /tmp/f3d.apk && \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
+    draco && \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    f3d && \
   echo "**** install manyfold ****" && \
   mkdir -p /app/www && \
   if [ -z ${MANYFOLD_VERSION+x} ]; then \
@@ -84,6 +83,7 @@ RUN \
   DATABASE_URL="nulldb://user:pass@localhost/db" \
   SECRET_KEY_BASE="placeholder" \
   APP_VERSION=${MANYFOLD_VERSION} \
+  RAILS_ASSETS_PRECOMPILE=1 \
   bundle exec rake assets:precompile && \
   rm db/schema.rb && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \

Dockerfile.aarch64

@@ -18,7 +18,7 @@ ENV RAILS_ENV="production" \
     APP_VERSION=${MANYFOLD_VERSION} \
     HOME=/config
 
-COPY --from=ruby:3.4.9-alpine3.24 /usr/local /usr/local/
+COPY --from=ruby:3.4.12-alpine3.24 /usr/local /usr/local/
 
 RUN \
   apk add --no-cache \
@@ -36,6 +36,7 @@ RUN \
     libarchive \
     libucontext \
     mariadb-connector-c \
+    mesa-egl \
     opencascade \
     openexr-libopenexr \
     pciutils \
@@ -52,12 +53,10 @@ RUN \
     npm \
     postgresql-dev \
     yaml-dev && \
-  echo "**** install manyfold F3D package ****" && \
-  curl -s -o \
-    /tmp/f3d.apk -L \
-    "https://github.com/manyfold3d/f3d-alpine/releases/download/v3.5.0-r0-1/f3d-3.5.0-r0.aarch64.apk" && \
-  apk add --no-cache --allow-untrusted /tmp/f3d.apk && \
-  rm /tmp/f3d.apk && \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
+    draco && \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    f3d && \
   echo "**** install manyfold ****" && \
   mkdir -p /app/www && \
   if [ -z ${MANYFOLD_VERSION+x} ]; then \
@@ -84,6 +83,7 @@ RUN \
   DATABASE_URL="nulldb://user:pass@localhost/db" \
   SECRET_KEY_BASE="placeholder" \
   APP_VERSION=${MANYFOLD_VERSION} \
+  RAILS_ASSETS_PRECOMPILE=1 \
   bundle exec rake assets:precompile && \
   rm db/schema.rb && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \

Jenkinsfile

@@ -31,12 +31,12 @@ pipeline {
     PR_DOCKERHUB_IMAGE = 'lspipepr/manyfold'
     DIST_IMAGE = 'alpine'
     MULTIARCH='true'
-    CI='true'
-    CI_WEB='true'
+    CI='false'
+    CI_WEB='false'
     CI_PORT='3214'
     CI_SSL='false'
     CI_DELAY='240'
-    CI_DOCKERENV='SECRET_KEY_BASE=placeholder|DATABASE_URL=sqlite3:/config/manyfold.sqlite3|DOCKER_MODS=lscr.io/linuxserver/mods:universal-redis'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH=''
   }

README.md

@@ -35,7 +35,6 @@ Find us at:
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/manyfold.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/manyfold)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/manyfold.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/manyfold)
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-manyfold%2Fjob%2Fmain%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-manyfold/job/main/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fmanyfold%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/manyfold/latest/index.html)
 
 [Manyfold](https://github.com/manyfold3d/manyfold/)  is an open source, self-hosted web application for managing a collection of 3D models, particularly focused on 3D printing.
 

jenkins-vars.yml

@@ -19,11 +19,11 @@ repo_vars:
   - PR_DOCKERHUB_IMAGE = 'lspipepr/manyfold'
   - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
-  - CI='true'
-  - CI_WEB='true'
+  - CI='false'
+  - CI_WEB='false'
   - CI_PORT='3214'
   - CI_SSL='false'
   - CI_DELAY='240'
-  - CI_DOCKERENV='SECRET_KEY_BASE=placeholder|DATABASE_URL=sqlite3:/config/manyfold.sqlite3|DOCKER_MODS=lscr.io/linuxserver/mods:universal-redis'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH=''