upgrade plume

cluster/prod/app/plume/build/docker-compose.yml

@@ -4,5 +4,5 @@ services:
     build:
       context: ./plume
       args:
-        PLUME_VERSION: 61e65a55ad1f5094321c111e395d00dddcb05e96
-    image: superboum/plume:v8
+        PLUME_VERSION: f690342564627c98f1a9d6e40087510db3be2fcf
+    image: superboum/plume:v10

cluster/prod/app/plume/build/plume/Dockerfile

@@ -1,6 +1,8 @@
-#FROM rust:1.69-bullseye as builder
-FROM rustlang/rust:nightly-bullseye as builder
+# https://hub.docker.com/r/rustlang/rust/tags
+# As per 2025-04-04
+FROM rustlang/rust@sha256:b6bcab015df5121ca0bef1e650544b4d70a3272a6d2cfab957a4015ea4209dfc AS builder
 
+# CREATE COMPILATION ENV
 RUN apt-get update && \
     apt-get install -y \
       pkg-config \
@@ -11,7 +13,8 @@ RUN apt-get update && \
       libpq-dev \
       gettext \
       git \
-      python \
+      python3 \
+      python-is-python3 \
       curl \
       gcc \
       make \
@@ -21,19 +24,28 @@ RUN apt-get update && \
 
 RUN cargo install wasm-pack
 
+# FETCH
 ARG PLUME_VERSION
 WORKDIR /opt
-RUN git clone -n https://git.joinplu.me/lx/Plume.git plume
-
+RUN git clone -n https://git.joinplu.me/Plume/Plume.git plume
 WORKDIR /opt/plume
 RUN git checkout ${PLUME_VERSION}
-# Small style patch to make text column wider
-RUN git merge 397e3b4d9720475257817b322c05323d12918216
+
+# PATCHING
+COPY *.diff .
+RUN git apply larger_cols.diff
+RUN git apply bump_guid_create_dependency.diff
+RUN git apply avoid_unexpected_token.diff
+RUN git apply patch_rocket_0_4_11.diff
+
+# ????
 RUN rm rust-toolchain
 
+# PREPARE WASM TOOLCHAIN
 WORKDIR /opt/plume/script
 RUN chmod a+x ./wasm-deps.sh && ./wasm-deps.sh
 
+# COMPILATION
 WORKDIR /opt/plume
 RUN chmod a+x ./script/plume-front.sh && ./script/plume-front.sh
 RUN cargo install --path ./ --force --no-default-features --features postgres,s3
@@ -41,14 +53,12 @@ RUN cargo install --path plume-cli --force --no-default-features --features post
 RUN cargo clean
 
 #-----------------------------
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
     libpq5 \
-    libssl1.1 \
-    rclone \
-    fuse
+    libssl3
 
 WORKDIR /app
 

cluster/prod/app/plume/build/plume/avoid_unexpected_token.diff

@@ -0,0 +1,18 @@
+diff --git a/plume-front/src/editor.rs b/plume-front/src/editor.rs
+index 94bbbb59..0ef077bf 100644
+--- a/plume-front/src/editor.rs
++++ b/plume-front/src/editor.rs
+@@ -168,10 +168,12 @@ fn load_autosave() {
+         .get(&get_autosave_id())
+     {
+         let autosave_info: AutosaveInformation = serde_json::from_str(&autosave_str).ok().unwrap();
++        let js_date = JsValue::from_f64(autosave_info.last_saved);
++        let js_date_b = &js_date;
+         let message = i18n!(
+             CATALOG,
+             "Do you want to load the local autosave last edited at {}?";
+-            Date::new(&JsValue::from_f64(autosave_info.last_saved)).to_date_string().as_string().unwrap()
++            Date::new(js_date_b).to_date_string().as_string().unwrap()
+         );
+         if let Ok(true) = window().unwrap().confirm_with_message(&message) {
+             set_value("editor-content", &autosave_info.contents);

cluster/prod/app/plume/build/plume/larger_cols.diff

@@ -0,0 +1,15 @@
+diff --git a/assets/themes/default/_variables.scss b/assets/themes/default/_variables.scss
+index b76a17cf..0326f4bd 100644
+--- a/assets/themes/default/_variables.scss
++++ b/assets/themes/default/_variables.scss
+@@ -18,8 +18,8 @@ $success-color: $green;
+ 
+ /* Dimensions */
+ 
+-$article-width: 70ch;
+-$horizontal-margin: 20%;
++$article-width: 100ch;
++$horizontal-margin: 15%;
+ $margin: 0 $horizontal-margin;
+ 
+ /* Fonts */

cluster/prod/app/plume/build/plume/patch_rocket_0_4_11.diff

@@ -0,0 +1,83 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index b01bb5d8..710529fc 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -921,9 +921,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "ctrlc"
+-version = "3.4.5"
++version = "3.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
++checksum = "697b5419f348fd5ae2478e8018cb016c00a5881c7f46c717de98ffd135a5651c"
+ dependencies = [
+  "nix 0.29.0",
+  "windows-sys 0.59.0",
+@@ -1287,9 +1287,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+ 
+ [[package]]
+ name = "errno"
+-version = "0.3.10"
++version = "0.3.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
++checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+ dependencies = [
+  "libc",
+  "windows-sys 0.59.0",
+@@ -4259,8 +4259,7 @@ dependencies = [
+ [[package]]
+ name = "rocket"
+ version = "0.4.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "83b9d9dc08c5dcc1d8126a9dd615545e6a358f8c13c883c8dfed8c0376fa355e"
++source = "git+https://github.com/superboum/Rocket?branch=for-plume#93c6eb0205b2ed8361a0447c58d6bc7bb0901d77"
+ dependencies = [
+  "atty",
+  "base64 0.13.1",
+@@ -4280,8 +4279,7 @@ dependencies = [
+ [[package]]
+ name = "rocket_codegen"
+ version = "0.4.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2810037b5820098af97bd4fdd309e76a8101ceb178147de775c835a2537284fe"
++source = "git+https://github.com/superboum/Rocket?branch=for-plume#93c6eb0205b2ed8361a0447c58d6bc7bb0901d77"
+ dependencies = [
+  "devise",
+  "glob",
+@@ -4295,8 +4293,7 @@ dependencies = [
+ [[package]]
+ name = "rocket_contrib"
+ version = "0.4.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e20efbc6a211cb3df5375accf532d4186f224b623f39eca650b19b96240c596b"
++source = "git+https://github.com/superboum/Rocket?branch=for-plume#93c6eb0205b2ed8361a0447c58d6bc7bb0901d77"
+ dependencies = [
+  "log 0.4.27",
+  "notify",
+@@ -4320,8 +4317,7 @@ dependencies = [
+ [[package]]
+ name = "rocket_http"
+ version = "0.4.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2bf9cbd128e1f321a2d0bebd2b7cf0aafd89ca43edf69e49b56a5c46e48eb19f"
++source = "git+https://github.com/superboum/Rocket?branch=for-plume#93c6eb0205b2ed8361a0447c58d6bc7bb0901d77"
+ dependencies = [
+  "cookie 0.11.5",
+  "hyper 0.10.16",
+diff --git a/Cargo.toml b/Cargo.toml
+index bef8fd5e..3e445d54 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -29,6 +29,10 @@ tracing-subscriber = "0.3.10"
+ riker = "0.4.2"
+ activitystreams = "=0.7.0-alpha.20"
+ 
++[patch.crates-io]
++rocket = { git="https://github.com/superboum/Rocket", branch="for-plume" }
++rocket_contrib = { git="https://github.com/superboum/Rocket", branch="for-plume" }
++
+ [[bin]]
+ name = "plume"
+ path = "src/main.rs"

cluster/prod/app/plume/deploy/plume.hcl

@@ -50,7 +50,7 @@ job "plume-blog" {
     task "plume" {
       driver = "docker"
       config {
-        image = "lxpz/plume_s3:v1"
+        image = "superboum/plume:v10"
         network_mode = "host"
         ports = [ "back_port" ]
 	command = "sh"