Merge branch 'atomheartother:master' into 'master'

See https://github.com/timvisee/send/pull/6
This commit is contained in:
timvisee 2021-02-16 15:10:22 +01:00
commit 42e94139a2
No known key found for this signature in database
GPG Key ID: B8DB720BC383E172
2 changed files with 6 additions and 8 deletions

View File

@ -6,13 +6,13 @@
# Build project
FROM node:12 AS builder
FROM node:15.5.1-alpine AS builder
RUN set -x \
# Add user
&& addgroup --gid 10001 app \
&& adduser --disabled-password \
--gecos '' \
--gid 10001 \
--ingroup app \
--home /app \
--uid 10001 \
app
@ -26,19 +26,17 @@ RUN set -x \
# Main image
FROM node:12-slim
FROM node:15.5.1-alpine
RUN set -x \
# Add user
&& addgroup --gid 10001 app \
&& adduser --disabled-password \
--gecos '' \
--gid 10001 \
--ingroup app \
--home /app \
--uid 10001 \
app
RUN apt-get update && apt-get -y install \
git-core \
&& rm -rf /var/lib/apt/lists/*
USER app
WORKDIR /app
COPY --chown=app:app package*.json ./

View File

@ -61,7 +61,7 @@
"cache": true
},
"engines": {
"node": "^12.16.3"
"node": "^15.5.1"
},
"devDependencies": {
"@babel/core": "^7.12.13",