fix: custom directory doesn't work in containers

Dockerfile

@@ -86,7 +86,12 @@ COPY --from=build /firefish/packages/backend/assets/instance.css /firefish/packa
 COPY --from=build /firefish/packages/backend/native-utils/built /firefish/packages/backend/native-utils/built
 
 RUN corepack enable && corepack prepare pnpm@latest --activate
+ARG VERSION
+ENV VERSION=${VERSION}
+RUN pnpm pkg set version="${VERSION}"
+
 ENV NODE_ENV=production
 VOLUME "/firefish/files"
 ENTRYPOINT [ "/usr/bin/tini", "--" ]
-CMD [ "pnpm", "run", "migrateandstart" ]
+
+CMD [ "pnpm", "run", "start:container" ]

README.md

@@ -143,6 +143,7 @@
 
 うまく動いていそうだったら本家に push されます
 
+- Docker/Podman の環境で `custom` ディレクトリの内容が反映されない不具合を修正
 - 画面を下に引いてタイムラインなどを更新する機能を追加（Misskey から取り込み）
   - 本家にもマージリクエストを出しました ([!10644](https://git.joinfirefish.org/firefish/firefish/-/merge_requests/10644))
 

docker-compose.example.yml

@@ -16,7 +16,7 @@ services:
     environment:
       NODE_ENV: production
     volumes:
-      - ./assets:/firefish/custom/assets
+      - ./custom:/firefish/custom:ro
       - ./files:/firefish/files
       - ./.config:/firefish/.config:ro
       - ./neko/volume:/firefish/neko/volume:ro

neko/messages/20240102_add_volume_to_docker_compose

@@ -5,7 +5,7 @@
 |                                                                   |
 | After editing, services.web.volumes should look like this:        |
 | volumes:                                                          |
-|   - ./assets:/firefish/custom/assets                              |
+|   - ./custom:/firefish/custom:ro                                  |
 |   - ./files:/firefish/files                                       |
 |   - ./.config:/firefish/.config:ro                                |
 |   - ./neko/volume:/firefish/neko/volume:ro  <-- add this line     |

neko/messages/20240108_edit_docker_compose

@@ -0,0 +1,16 @@
+ -----------------------------------------------------------
+| For Docker users:                                         |
+| Sorry, there was an error in docker-compose.example.yml,  |
+| so your docker-compose.yml is probably misconfigured too. |
+|                                                           |
+| Please replace                                            |
+|                                                           |
+|   - ./assets:/firefish/custom/assets                      |
+|                                                           |
+| in services.web.volumes with                              |
+|                                                           |
+|   - ./custom:/firefish/custom:ro                          |
+|                                                           |
+| For the detailed explanation, see:                        |
+| https://post.naskya.net/notes/9o817o4hdezf7p8o            |
+ -----------------------------------------------------------

package.json

@@ -12,10 +12,10 @@
 		"rebuild": "pnpm run clean && pnpm run build",
 		"build": "pnpm --filter firefish-js run build && pnpm --filter !firefish-js -r --parallel run build && pnpm run gulp",
 		"start": "pnpm --filter backend run start",
+		"start:container": "pnpm run gulp && pnpm run migrate && pnpm run start",
 		"init": "pnpm run migrate",
 		"migrate": "pnpm --filter backend run migrate",
 		"revertmigration": "pnpm --filter backend run revertmigration",
-		"migrateandstart": "pnpm run migrate && pnpm run start",
 		"gulp": "gulp build",
 		"watch": "pnpm run dev",
 		"dev": "pnpm node ./scripts/dev.mjs",
@@ -38,6 +38,11 @@
 		"@bull-board/ui": "5.10.2",
 		"@napi-rs/cli": "2.17.0",
 		"@tensorflow/tfjs": "4.15.0",
+		"gulp": "4.0.2",
+		"gulp-cssnano": "2.1.3",
+		"gulp-rename": "2.0.0",
+		"gulp-replace": "1.1.4",
+		"gulp-terser": "2.1.0",
 		"js-yaml": "4.1.0",
 		"seedrandom": "3.0.5"
 	},
@@ -53,11 +58,6 @@
 		"add": "2.0.6",
 		"cross-env": "7.0.3",
 		"execa": "8.0.1",
-		"gulp": "4.0.2",
-		"gulp-cssnano": "2.1.3",
-		"gulp-rename": "2.0.0",
-		"gulp-replace": "1.1.4",
-		"gulp-terser": "2.1.0",
 		"install-peers": "^1.0.4",
 		"pnpm": "8.14.0",
 		"typescript": "5.3.3"