mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 02:16:05 +01:00 
			
		
		
		
	chore(docker): format Dockerfiles
This commit is contained in:
		| @@ -1,28 +1,28 @@ | |||||||
| FROM node:22.16.0-bullseye-slim AS builder | FROM node:22.16.0-bullseye-slim AS builder | ||||||
|     RUN corepack enable | RUN corepack enable | ||||||
|  |  | ||||||
|     # Install native dependencies since we might be building cross-platform. | # Install native dependencies since we might be building cross-platform. | ||||||
|     WORKDIR /usr/src/app/build | WORKDIR /usr/src/app/build | ||||||
|     COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ | COPY ./docker/package.json ./docker/pnpm-workspace.yaml /usr/src/app/ | ||||||
|     # We have to use --no-frozen-lockfile due to CKEditor patches | # We have to use --no-frozen-lockfile due to CKEditor patches | ||||||
|     RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild | RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild | ||||||
|  |  | ||||||
| FROM node:22.16.0-bullseye-slim | FROM node:22.16.0-bullseye-slim | ||||||
|     # Install only runtime dependencies | # Install only runtime dependencies | ||||||
|     RUN apt-get update && \ | RUN apt-get update && \ | ||||||
|     apt-get install -y --no-install-recommends \ |     apt-get install -y --no-install-recommends \ | ||||||
|     gosu && \ |     gosu && \ | ||||||
|     rm -rf \ |     rm -rf \ | ||||||
|     /var/lib/apt/lists/* \ |     /var/lib/apt/lists/* \ | ||||||
|     /var/cache/apt/* |     /var/cache/apt/* | ||||||
|  |  | ||||||
|     WORKDIR /usr/src/app | WORKDIR /usr/src/app | ||||||
|     COPY ./dist /usr/src/app | COPY ./dist /usr/src/app | ||||||
|     RUN rm -rf /usr/src/app/node_modules/better-sqlite3 | RUN rm -rf /usr/src/app/node_modules/better-sqlite3 | ||||||
|     COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 | COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 | ||||||
|     COPY ./start-docker.sh /usr/src/app | COPY ./start-docker.sh /usr/src/app | ||||||
|  |  | ||||||
|     # Configure container | # Configure container | ||||||
|     EXPOSE 8080 | EXPOSE 8080 | ||||||
|     CMD [ "sh", "./start-docker.sh" ] | CMD [ "sh", "./start-docker.sh" ] | ||||||
|     HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs | HEALTHCHECK --start-period=10s CMD exec gosu node node /usr/src/app/docker_healthcheck.cjs | ||||||
| @@ -1,26 +1,26 @@ | |||||||
| FROM node:22.16.0-alpine AS builder | FROM node:22.16.0-alpine AS builder | ||||||
|     RUN corepack enable | RUN corepack enable | ||||||
|  |  | ||||||
|     # Install native dependencies since we might be building cross-platform. | # Install native dependencies since we might be building cross-platform. | ||||||
|     WORKDIR /usr/src/app | WORKDIR /usr/src/app | ||||||
|     COPY ./docker/package.json  ./docker/pnpm-workspace.yaml /usr/src/app/ | COPY ./docker/package.json  ./docker/pnpm-workspace.yaml /usr/src/app/ | ||||||
|     # We have to use --no-frozen-lockfile due to CKEditor patches | # We have to use --no-frozen-lockfile due to CKEditor patches | ||||||
|     RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild | RUN pnpm install --no-frozen-lockfile --prod && pnpm rebuild | ||||||
|  |  | ||||||
| FROM node:22.16.0-alpine | FROM node:22.16.0-alpine | ||||||
|     # Install runtime dependencies | # Install runtime dependencies | ||||||
|     RUN apk add --no-cache su-exec shadow | RUN apk add --no-cache su-exec shadow | ||||||
|  |  | ||||||
|     WORKDIR /usr/src/app | WORKDIR /usr/src/app | ||||||
|     COPY ./dist /usr/src/app | COPY ./dist /usr/src/app | ||||||
|     RUN rm -rf /usr/src/app/node_modules/better-sqlite3 | RUN rm -rf /usr/src/app/node_modules/better-sqlite3 | ||||||
|     COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 | COPY --from=builder /usr/src/app/node_modules/better-sqlite3 /usr/src/app/node_modules/better-sqlite3 | ||||||
|     COPY ./start-docker.sh /usr/src/app | COPY ./start-docker.sh /usr/src/app | ||||||
|  |  | ||||||
|     # Add application user | # Add application user | ||||||
|     RUN adduser -s /bin/false node; exit 0 | RUN adduser -s /bin/false node; exit 0 | ||||||
|  |  | ||||||
|     # Configure container | # Configure container | ||||||
|     EXPOSE 8080 | EXPOSE 8080 | ||||||
|     CMD [ "sh", "./start-docker.sh" ] | CMD [ "sh", "./start-docker.sh" ] | ||||||
|     HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.cjs | HEALTHCHECK --start-period=10s CMD exec su-exec node node /usr/src/app/docker_healthcheck.cjs | ||||||
		Reference in New Issue
	
	Block a user