Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/vre-panel/vre-panel-…
Browse files Browse the repository at this point in the history
…npm-0bebc4a518
  • Loading branch information
gpelouze authored Aug 8, 2024
2 parents 4515187 + a9ede32 commit b7f314d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion tilt/vre-panel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine3.16
FROM node:22-alpine
ARG NODE_ENV=test
ENV NODE_ENV $NODE_ENV

Expand Down
2 changes: 1 addition & 1 deletion tilt/vreapis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.2-slim
FROM python:3.12.5-slim

WORKDIR /app

Expand Down
6 changes: 3 additions & 3 deletions vre-panel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Install dependencies only when needed
FROM node:21-alpine AS deps
FROM node:22-alpine AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
Expand All @@ -12,7 +12,7 @@ RUN npm install
RUN npm ci

# Rebuild the source code only when needed
FROM node:21-alpine AS builder
FROM node:22-alpine AS builder
ARG NODE_ENV
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
Expand All @@ -29,7 +29,7 @@ COPY . .
RUN npm run build

# Production image, copy all the files and run next
FROM node:21-alpine AS runner
FROM node:22-alpine AS runner
WORKDIR /app

ENV NODE_ENV production
Expand Down
2 changes: 1 addition & 1 deletion vreapis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.2-slim
FROM python:3.12.5-slim

WORKDIR /app

Expand Down
14 changes: 7 additions & 7 deletions vreapis/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
django==5.0.3
djangorestframework==3.14.0
django==5.1
djangorestframework==3.15.2
djangorestframework-gis==1.0
django-filter==24.2
whitenoise==6.6.0
django-filter==24.3
whitenoise==6.7.0
gunicorn==22.0.0
pyyaml==6.0.1
requests==2.31.0
pyyaml==6.0.2
requests==2.32.3
django-dotenv==1.4.2
django-cors-headers==4.3.1
django-cors-headers==4.4.0
django-extensions==3.2.3
psycopg2==2.9.9
django-probes==1.7.0

0 comments on commit b7f314d

Please sign in to comment.