mirror of
https://github.com/Chewbaccalakis/rfid-database.git
synced 2026-09-09 16:01:56 -07:00
Merge origin/main; resolve Docker file conflicts
PR #1 was squash-merged to main with the initial Dockerfile/README. Keep the Compose-enhanced versions from this branch (superset).
This commit is contained in:
+27
@@ -2,21 +2,33 @@
|
||||
|
||||
FROM node:22-bookworm-slim AS deps
|
||||
WORKDIR /app
|
||||
<<<<<<< HEAD
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends python3 make g++ \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
=======
|
||||
RUN apt-get update && apt-get install -y python3 make g++ && rm -rf /var/lib/apt/lists/*
|
||||
>>>>>>> origin/main
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci
|
||||
|
||||
FROM node:22-bookworm-slim AS builder
|
||||
WORKDIR /app
|
||||
<<<<<<< HEAD
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends python3 make g++ \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
=======
|
||||
RUN apt-get update && apt-get install -y python3 make g++ && rm -rf /var/lib/apt/lists/*
|
||||
>>>>>>> origin/main
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
ENV NEXT_TELEMETRY_DISABLED=1
|
||||
ENV AUTH_SECRET=build-time-placeholder-secret-32chars
|
||||
<<<<<<< HEAD
|
||||
RUN npm run build \
|
||||
&& npm prune --omit=dev
|
||||
=======
|
||||
RUN npm run build
|
||||
>>>>>>> origin/main
|
||||
|
||||
FROM node:22-bookworm-slim AS runner
|
||||
WORKDIR /app
|
||||
@@ -24,6 +36,7 @@ ENV NODE_ENV=production
|
||||
ENV NEXT_TELEMETRY_DISABLED=1
|
||||
ENV RFID_DB_PATH=/data/rfid.db
|
||||
ENV PORT=3000
|
||||
<<<<<<< HEAD
|
||||
ENV HOSTNAME=0.0.0.0
|
||||
ENV AUTH_TRUST_HOST=true
|
||||
|
||||
@@ -52,4 +65,18 @@ HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \
|
||||
CMD curl -fsS http://127.0.0.1:3000/login >/dev/null || exit 1
|
||||
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
=======
|
||||
RUN apt-get update && apt-get install -y libstdc++6 && rm -rf /var/lib/apt/lists/*
|
||||
RUN mkdir -p /data && chown node:node /data
|
||||
COPY --from=builder /app/package.json /app/package-lock.json ./
|
||||
COPY --from=builder /app/node_modules ./node_modules
|
||||
COPY --from=builder /app/.next ./.next
|
||||
COPY --from=builder /app/public ./public
|
||||
COPY --from=builder /app/scripts ./scripts
|
||||
COPY --from=builder /app/src ./src
|
||||
COPY --from=builder /app/tsconfig.json ./tsconfig.json
|
||||
USER node
|
||||
EXPOSE 3000
|
||||
VOLUME ["/data"]
|
||||
>>>>>>> origin/main
|
||||
CMD ["npm", "run", "start"]
|
||||
|
||||
Reference in New Issue
Block a user