diff --git a/Dockerfile b/Dockerfile index 7286865..a0dd780 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,8 @@ -FROM rust:1.82-slim-bookworm AS builder +FROM rust:1.83-slim-bookworm AS builder WORKDIR /app # Install dependencies. -RUN set -x && apt-get update && apt-get install -y protobuf-compiler - -# Copy manifest and fetch dependencies. -COPY ["./Cargo.lock", "./Cargo.toml", "./"] -RUN set -x && cargo fetch +RUN set -x && apt-get update && apt-get install -y protobuf-compiler curl # Copy source code and build. COPY [".", "./"] diff --git a/Dockerfile.dockerignore b/Dockerfile.dockerignore index 14af640..e3bc78e 100644 --- a/Dockerfile.dockerignore +++ b/Dockerfile.dockerignore @@ -19,5 +19,5 @@ retrack.toml rustfmt.toml # Path that should be ignored by api Docker image -/components +/components/retrack-web-scraper *.json diff --git a/Dockerfile.web-scraper b/Dockerfile.web-scraper index ae53015..574b178 100644 --- a/Dockerfile.web-scraper +++ b/Dockerfile.web-scraper @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM node:22-alpine3.20 AS builder +FROM --platform=$BUILDPLATFORM node:22-alpine3.21 AS builder WORKDIR /app # Copy workspace root `package.json` and `package-lock.json` files, @@ -12,7 +12,7 @@ COPY ["./components/retrack-web-scraper", "./components/retrack-web-scraper"] RUN set -x && npm test --ws RUN set -x && npm run build --ws -FROM node:22-alpine3.20 +FROM node:22-alpine3.21 ENV NODE_ENV=production \ RETRACK_WEB_SCRAPER_BROWSER_EXECUTABLE_PATH="/usr/bin/chromium-browser" \ DISPLAY=:99