Port Dockerfile optimizations from v2 to v1.53, no functionality changes. (#386)

* port v2 optimizations to v1.5

Updated dockerfile with v2 optimizations. Ported Login.ts no dialogs fix.

* Update entrypoint.sh

Fix playwright path in entrypoint as well
This commit is contained in:
Michael Cammarata
2025-10-21 09:48:59 -04:00
committed by GitHub
parent 14492b27cb
commit 86f65b448d
6 changed files with 3206 additions and 44 deletions

View File

@@ -1,68 +1,89 @@
###############################################################################
# Stage 1: Builder (compile TypeScript)
# Stage 1: Builder
###############################################################################
FROM node:18-slim AS builder
FROM node:22-slim AS builder
WORKDIR /usr/src/microsoft-rewards-script
# Install minimal tooling if needed
RUN apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates \
&& rm -rf /var/lib/apt/lists/*
ENV PLAYWRIGHT_BROWSERS_PATH=0
# Copy package manifests
COPY package*.json ./
# Copy package files
COPY package.json package-lock.json tsconfig.json ./
# Conditional install: npm ci if lockfile exists, else npm install
RUN if [ -f package-lock.json ]; then \
npm ci; \
else \
npm install; \
fi
# Install all dependencies required to build the script
RUN npm ci --ignore-scripts
# Copy source code
# Copy source and build
COPY . .
# Build TypeScript
RUN npm run build
# Remove build dependencies, and reinstall only runtime dependencies
RUN rm -rf node_modules \
&& npm ci --omit=dev --ignore-scripts \
&& npm cache clean --force
# Install Chromium Headless Shell, and cleanup
RUN npx playwright install --with-deps --only-shell chromium \
&& rm -rf /root/.cache /tmp/* /var/tmp/*
###############################################################################
# Stage 2: Runtime (Playwright image)
# Stage 2: Runtime
###############################################################################
FROM mcr.microsoft.com/playwright:v1.52.0-jammy
FROM node:22-slim AS runtime
WORKDIR /usr/src/microsoft-rewards-script
# Install cron, gettext-base (for envsubst), tzdata noninteractively
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
cron gettext-base tzdata \
&& rm -rf /var/lib/apt/lists/*
# Set production environment variables
ENV NODE_ENV=production \
TZ=UTC \
PLAYWRIGHT_BROWSERS_PATH=0 \
FORCE_HEADLESS=1
# Ensure Playwright uses preinstalled browsers
ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
# Install minimal system libraries required for Chromium headless to run
RUN apt-get update && apt-get install -y --no-install-recommends \
cron \
gettext-base \
tzdata \
ca-certificates \
libglib2.0-0 \
libdbus-1-3 \
libexpat1 \
libfontconfig1 \
libgtk-3-0 \
libnspr4 \
libnss3 \
libasound2 \
libflac12 \
libatk1.0-0 \
libatspi2.0-0 \
libdrm2 \
libgbm1 \
libdav1d6 \
libx11-6 \
libx11-xcb1 \
libxcomposite1 \
libxcursor1 \
libxdamage1 \
libxext6 \
libxfixes3 \
libxi6 \
libxrandr2 \
libxrender1 \
libxss1 \
libxtst6 \
libdouble-conversion3 \
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
# Copy package files first for better caching
COPY --from=builder /usr/src/microsoft-rewards-script/package*.json ./
# Install only production dependencies, with fallback
RUN if [ -f package-lock.json ]; then \
npm ci --omit=dev --ignore-scripts; \
else \
npm install --production --ignore-scripts; \
fi
# Copy built application
# Copy compiled application and dependencies from builder stage
COPY --from=builder /usr/src/microsoft-rewards-script/dist ./dist
COPY --from=builder /usr/src/microsoft-rewards-script/package*.json ./
COPY --from=builder /usr/src/microsoft-rewards-script/node_modules ./node_modules
# Copy runtime scripts with proper permissions from the start
COPY --chmod=755 src/run_daily.sh ./src/run_daily.sh
COPY --chmod=644 src/crontab.template /etc/cron.d/microsoft-rewards-cron.template
COPY --chmod=755 entrypoint.sh /usr/local/bin/entrypoint.sh
# Default TZ (overridden by user via environment)
ENV TZ=UTC
# Entrypoint handles TZ, initial run toggle, cron templating & launch
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
CMD ["sh", "-c", "echo 'Container started; cron is running.'"]