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

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10259
This commit is contained in:
Kainoa Kanter 2023-06-04 21:48:39 +00:00
commit f1e8099c48
4 changed files with 10 additions and 4 deletions

4
.gitignore vendored
View File

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

View File

@ -36,7 +36,7 @@ FROM node:19-alpine
WORKDIR /calckey WORKDIR /calckey
# Install runtime dependencies # 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 . ./ COPY . ./

View File

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

View File

@ -8,10 +8,10 @@
"start:test": "NODE_ENV=test pnpm node ./built/index.js", "start:test": "NODE_ENV=test pnpm node ./built/index.js",
"migrate": "pnpm run migrate:typeorm && pnpm run migrate:cargo", "migrate": "pnpm run migrate:typeorm && pnpm run migrate:cargo",
"migrate:typeorm": "typeorm migration:run -d ormconfig.js", "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": "pnpm run revertmigration:cargo && pnpm run revertmigration:typeorm",
"revertmigration:typeorm": "typeorm migration:revert -d ormconfig.js", "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", "check:connect": "node ./check_connect.js",
"build": "pnpm swc src -d built -D", "build": "pnpm swc src -d built -D",
"watch": "pnpm swc src -d built -D -w", "watch": "pnpm swc src -d built -D -w",