Merge branch 'krombel-release_4.14.0'

This commit is contained in:
Adrian Nöthlich 2022-04-25 18:09:37 +02:00
commit 5f91c8fb39
No known key found for this signature in database
GPG key ID: CBA6B4E35D326EFE
5 changed files with 9 additions and 9 deletions

View file

@ -1,5 +1,5 @@
# Multistage build to reduce image size and increase security # Multistage build to reduce image size and increase security
FROM node:12-buster-slim AS build FROM node:16-buster-slim AS build
# Install requirements to clone repository and install deps # Install requirements to clone repository and install deps
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq git RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq git
@ -21,7 +21,7 @@ RUN npm install --production \
&& bower install --allow-root && bower install --allow-root
# Create actual cryptpad image # Create actual cryptpad image
FROM node:12-buster-slim FROM node:16-buster-slim
# Create user and group for cryptpad so it does not run as root # Create user and group for cryptpad so it does not run as root
RUN groupadd cryptpad -g 4001 RUN groupadd cryptpad -g 4001

View file

@ -1,5 +1,5 @@
# Multistage build to reduce image size and increase security # Multistage build to reduce image size and increase security
FROM node:12-alpine AS build FROM node:16-alpine AS build
# Install requirements to clone repository and install deps # Install requirements to clone repository and install deps
RUN apk add --no-cache git RUN apk add --no-cache git
@ -21,7 +21,7 @@ RUN npm install --production \
&& bower install --allow-root && bower install --allow-root
# Create actual cryptpad image # Create actual cryptpad image
FROM node:12-alpine FROM node:16-alpine
# Create user and group for cryptpad so it does not run as root # Create user and group for cryptpad so it does not run as root
RUN addgroup -g 4001 -S cryptpad \ RUN addgroup -g 4001 -S cryptpad \

View file

@ -1,6 +1,6 @@
# Multistage build to reduce image size and increase security # Multistage build to reduce image size and increase security
FROM node:12-buster-slim AS build FROM node:16-buster-slim AS build
# Install requirements to clone repository and install deps # Install requirements to clone repository and install deps
RUN apt-get update \ RUN apt-get update \
@ -18,7 +18,7 @@ RUN npm install --production \
&& bower install --allow-root && bower install --allow-root
# Create actual cryptpad image # Create actual cryptpad image
FROM node:12-buster-slim FROM node:16-buster-slim
RUN set -x \ RUN set -x \
# Create users and groups for cryptpad # Create users and groups for cryptpad

View file

@ -1,6 +1,6 @@
# Multistage build to reduce image size and increase security # Multistage build to reduce image size and increase security
FROM node:12-alpine AS build FROM node:16-alpine AS build
# Install requirements to clone repository and install deps # Install requirements to clone repository and install deps
RUN apk add --no-cache git \ RUN apk add --no-cache git \
@ -17,7 +17,7 @@ RUN npm install --production \
&& bower install --allow-root && bower install --allow-root
# Create actual cryptpad image # Create actual cryptpad image
FROM node:12-alpine FROM node:16-alpine
RUN set -x \ RUN set -x \
# Create users and groups for nginx and cryptpad # Create users and groups for nginx and cryptpad

@ -1 +1 @@
Subproject commit 6de0030844c78a1574b46821dac6106d322ef6e5 Subproject commit 0513945f00070c94b5e41cfb908cbdc36733b3f2