nick/rfid-database
1
0
Fork 0
mirror of https://github.com/Chewbaccalakis/rfid-database.git synced 2026-09-09 16:01:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict markers on main and guard CI against them

Browse Source 
PR #2 merged before the Dockerfile cleanup landed, leaving <<<<<<<
markers that break docker compose build. Restore clean Docker files
and fail CI if conflict markers appear in the tree.
This commit is contained in:
Cursor Agent
2026-08-23 23:30:43 +00:00
parent d3ed4566b7
commit b3f8ef9db3
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
-27
View File
@@ -2,33 +2,21 @@
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
@@ -36,7 +24,6 @@ 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
@@ -65,18 +52,4 @@ 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"]