Merge branch 'atomheartother:master' into 'master'

See timvisee#6
sbois · Feb 16, 2021 · 42e9413 · 42e9413
2 parents 1f2c524 + 6bd6280
commit 42e9413
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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 ./

diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "cache": true
   },
   "engines": {
-    "node": "^12.16.3"
+    "node": "^15.5.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.13",