Merge pull request #4148 from mendersoftware/combined-prs-branch

Combined PRs
mendersoftware · Nov 2, 2023 · db81af0 · db81af0
2 parents 8aeff1b + 09bbecb
commit db81af0
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 378 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:20.8.0-alpine AS base
+FROM --platform=$BUILDPLATFORM node:21.1.0-alpine AS base
 WORKDIR /usr/src/app
 COPY package-lock.json package.json ./
 RUN npm ci
@@ -25,7 +25,7 @@ HEALTHCHECK --interval=8s --timeout=15s --start-period=120s --retries=128 CMD wg
 CMD ["nginx"]
 
 
-FROM nginx:1.25.2-alpine AS production
+FROM nginx:1.25.3-alpine AS production
 EXPOSE 8080
 WORKDIR /var/www/mender-gui/dist
 ARG GIT_COMMIT_TAG