From 589b8d83bd58b6d48e947575d16a8db0892d180b Mon Sep 17 00:00:00 2001 From: Leon van Kammen Date: Thu, 31 Jul 2025 11:30:07 +0200 Subject: [PATCH] update docker + fix modelpath --- manyfold/cli/manyfold.sh | 10 ++++++---- nix/docker.nix | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/manyfold/cli/manyfold.sh b/manyfold/cli/manyfold.sh index a152bc7..b5aa3ea 100755 --- a/manyfold/cli/manyfold.sh +++ b/manyfold/cli/manyfold.sh @@ -25,11 +25,13 @@ run(){ -e MULTIUSER=enabled \ -e FEDERATION=enabled \ -e THEME=vapor \ + -e NO_OVERLAYFS=true \ + -e NO_DEFAULTDB=true \ -e PUBLIC_HOSTNAME=localhost \ -e PUBLIC_PORT=80 \ --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \ - xrforge - #ghcr.io/manyfold3d/manyfold-solo:latest + ghcr.io/manyfold3d/manyfold-solo:latest + #xrforge } overlayfs(){ @@ -100,13 +102,13 @@ set_theme(){ set_modelpath(){ echocolor "[$APPNAME]" "enforcing modelpath" - debug sqlite3 /config/manyfold.sqlite3 "UPDATE settings SET value = '{tags}/{modelName}{modelId}' WHERE var == 'model_path_template';" + debug sqlite3 /config/manyfold.sqlite3 "UPDATE settings SET value = replace('--- \"{creator}/{modelName}/{modelId}\"\n','\n',char(10)) WHERE var == 'model_path_template';" } rename_app(){ echocolor "[$APPNAME]" "renaming manyfold to $APPNAME" sed -i 's/title: Manyfold/title: '$APPNAME'/g' /usr/src/app/config/locales/*.yml - sed -i 's|powered_by_html:.*|powered_by_html: Powered by Manyfold, XR Fragments and XR Forge|g' /usr/src/app/config/locales/*.yml + sed -i 's|powered_by_html:.*|powered_by_html: Powered by XR Forge, Manyfold, XR Fragments and NIX|g' /usr/src/app/config/locales/*.yml } # The new entrypoint of the docker diff --git a/nix/docker.nix b/nix/docker.nix index a00a1d7..84d564d 100644 --- a/nix/docker.nix +++ b/nix/docker.nix @@ -6,13 +6,14 @@ let vars = import ./vars.nix; # generate the reproducable blob below via: - # $ nix-shell -p nix-prefetch-docker --run 'nix-prefetch-docker ghcr.io/manyfold3d/manyfold-solo 0.117.0' + # $ nix-shell -p nix-prefetch-docker --run 'nix-prefetch-docker ghcr.io/manyfold3d/manyfold-solo 0.120.0' + manyfoldImage = pkgs.dockerTools.pullImage { imageName = "ghcr.io/manyfold3d/manyfold-solo"; - imageDigest = "sha256:95ae855376eb075bd718018e09eeee2735eece87d26c392abd0d63c38c8db44b"; - sha256 = "0na33qdll24cp4lc77dcmf3pi5s521gjrfqlahq52aw5vjapknfp"; + imageDigest = "sha256:84524b9cf8c8e6467ca4938e58ff65a2a5d8c507fd44e7056003b3e2dcffb266"; + sha256 = "0sb4icq19vqsnhi01jbaqqr2k66bfma08hp0rm0y4hdnbqsscxvd"; finalImageName = "ghcr.io/manyfold3d/manyfold-solo"; - finalImageTag = "0.117.0"; + finalImageTag = "0.120.0"; }; in