js/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost synced 2025-03-28 21:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

move storage data directory to root

Browse Source
This commit is contained in:
Philipinho 2024-06-27 15:07:48 +01:00
parent aea37eecda
commit e73293856b
7 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -2,3 +2,4 @@ node_modules
.git .git
.gitignore .gitignore
dist dist
data

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
.env .env
data
# compiled output # compiled output
/dist /dist
/node_modules /node_modules

6
Dockerfile
View File

@ -22,7 +22,7 @@ COPY --from=builder /app/apps/server/package.json /app/apps/server/package.json
COPY --from=builder /app/package.json /app/package.json COPY --from=builder /app/package.json /app/package.json
COPY --from=builder /app/packages/ /app/packages/ COPY --from=builder /app/packages/ /app/packages/
COPY --from=builder /app/pnpm*.yaml /app/ COPY --from=builder /app/pnpm*.yaml /app/
# should optimize packages
RUN npm install -g pnpm RUN npm install -g pnpm
RUN chown -R node:node /app RUN chown -R node:node /app
@ -31,9 +31,9 @@ USER node
RUN pnpm install --frozen-lockfile --prod RUN pnpm install --frozen-lockfile --prod
RUN mkdir -p /app/apps/server/data/storage RUN mkdir -p /app/data/storage
VOLUME ["/app/apps/server/data/storage"] VOLUME ["/app/data/storage"]
EXPOSE 3000 EXPOSE 3000

3
apps/client/src/features/editor/components/image/image-view.tsx
View File

@ -5,7 +5,7 @@ import { getFileUrl } from "@/lib/config.ts";
export default function ImageView(props: NodeViewProps) { export default function ImageView(props: NodeViewProps) {
const { node, selected } = props; const { node, selected } = props;
const { src, width, align } = node.attrs; const { src, width, align, title } = node.attrs;
const flexJustifyContent = useMemo(() => { const flexJustifyContent = useMemo(() => {
if (align === "center") return "center"; if (align === "center") return "center";
@ -26,6 +26,7 @@ export default function ImageView(props: NodeViewProps) {
fit="contain" fit="contain"
w={width} w={width}
src={getFileUrl(src)} src={getFileUrl(src)}
alt={title}
className={selected ? "ProseMirror-selectednode" : ""} className={selected ? "ProseMirror-selectednode" : ""}
/> />
</NodeViewWrapper> </NodeViewWrapper>

2
apps/client/src/features/workspace/components/settings/components/workspace-name-form.tsx
View File

@ -11,7 +11,7 @@ import { notifications } from "@mantine/notifications";
import useUserRole from "@/hooks/use-user-role.tsx"; import useUserRole from "@/hooks/use-user-role.tsx";
const formSchema = z.object({ const formSchema = z.object({
name: z.string().nonempty("Workspace name cannot be blank"), name: z.string().min(4).nonempty("Workspace name cannot be blank"),
}); });
type FormValues = z.infer<typeof formSchema>; type FormValues = z.infer<typeof formSchema>;

11
apps/server/src/common/helpers/constants.ts
View File

@ -1,2 +1,11 @@
import * as path from 'path';
export const APP_DATA_PATH = 'data'; export const APP_DATA_PATH = 'data';
export const LOCAL_STORAGE_PATH = `${APP_DATA_PATH}/storage`; const LOCAL_STORAGE_DIR = `${APP_DATA_PATH}/storage`;
export const LOCAL_STORAGE_PATH = path.resolve(
process.cwd(),
'..',
'..',
LOCAL_STORAGE_DIR,
);

3
apps/server/src/integrations/storage/providers/storage.provider.ts
View File

@ -13,6 +13,7 @@ import {
import { LocalDriver, S3Driver } from '../drivers'; import { LocalDriver, S3Driver } from '../drivers';
import * as process from 'node:process'; import * as process from 'node:process';
import { LOCAL_STORAGE_PATH } from '../../../common/helpers'; import { LOCAL_STORAGE_PATH } from '../../../common/helpers';
import path from 'path';
function createStorageDriver(disk: StorageConfig): StorageDriver { function createStorageDriver(disk: StorageConfig): StorageDriver {
switch (disk.driver) { switch (disk.driver) {
@ -35,7 +36,7 @@ export const storageDriverConfigProvider = {
return { return {
driver, driver,
config: { config: {
storagePath: process.cwd() + '/' + LOCAL_STORAGE_PATH, storagePath: LOCAL_STORAGE_PATH,
}, },
}; };