Skip to content

Commit

Permalink
Merge branch 'main' into renovate/lock-file-maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts authored Mar 28, 2024
2 parents 1f7ad24 + 054bf09 commit 4066455
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.18.0
uses: aquasecurity/trivy-action@0.19.0
with:
format: "sarif"
output: "trivy-results.sarif"
Expand Down
4 changes: 2 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build static files
# Node Bullseye has npm
FROM node:20.11.1-bullseye-slim AS buildWithDevDeps
FROM node:20.12.0-bullseye-slim AS buildWithDevDeps

# Install packages, build and keep only prod packages
WORKDIR /app
Expand All @@ -9,7 +9,7 @@ COPY ./src ./src
COPY ./prisma ./prisma
RUN npm ci --ignore-scripts --no-update-notifier
RUN npm run prisma-generate
FROM node:20.11.1-bullseye-slim AS build
FROM node:20.12.0-bullseye-slim AS build

# Install packages, build and keep only prod packages
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build static files
# Node Bullseye has npm
FROM node:20.11.1-bullseye-slim AS build
FROM node:20.12.0-bullseye-slim AS build

# Install packages, build and keep only prod packages
WORKDIR /app
Expand Down

0 comments on commit 4066455

Please sign in to comment.