Merge pull request '[PR]: Fix docker' (#10259) from nmkj/calckey:fix-docker into develop

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10259

.gitignore

@@ -62,3 +62,7 @@ yarn*
 # Nix Development shell items
 .devenv
 .direnv
+
+# Cargo cache for Docker
+/.cargo-cache
+/.cargo-target

Dockerfile

@@ -36,7 +36,7 @@ FROM node:19-alpine
 WORKDIR /calckey
 
 # Install runtime dependencies
-RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip
+RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip rust cargo
 
 COPY . ./
 

docker-compose.yml

@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
       - redis
-      - meilisearch
+#     - meilisearch
     ports:
       - "3000:3000"
     networks:
@@ -17,6 +17,8 @@ services:
     environment:
       NODE_ENV: production
     volumes:
+      - ./.cargo-cache:/root/.cargo
+      - ./.cargo-target:/calckey/packages/backend/native-utils/target
       - ./files:/calckey/files
       - ./.config:/calckey/.config:ro
 

packages/backend/package.json

@@ -8,10 +8,10 @@
 		"start:test": "NODE_ENV=test pnpm node ./built/index.js",
 		"migrate": "pnpm run migrate:typeorm && pnpm run migrate:cargo",
 		"migrate:typeorm": "typeorm migration:run -d ormconfig.js",
-		"migrate:cargo": "cargo run --manifest-path native-utils/migration/Cargo.toml -- up",
+		"migrate:cargo": "cargo run --manifest-path ./native-utils/migration/Cargo.toml -- up",
 		"revertmigration": "pnpm run revertmigration:cargo && pnpm run revertmigration:typeorm",
 		"revertmigration:typeorm": "typeorm migration:revert -d ormconfig.js",
-		"revertmigration:cargo": "cargo run --manifest-path native-utils/migration/Cargo.toml -- down",
+		"revertmigration:cargo": "cargo run --manifest-path ./native-utils/migration/Cargo.toml -- down",
 		"check:connect": "node ./check_connect.js",
 		"build": "pnpm swc src -d built -D",
 		"watch": "pnpm swc src -d built -D -w",