Merge pull request #257 from Amsterdam/improve--make-requirements

improved make requirements by adding a docker update

Dockerfile

@@ -19,8 +19,12 @@ RUN git config --global url."https://github.com/".insteadOf [email protected]:
 RUN npm --production=false --unsafe-perm ci && \
   npm cache clean --force
 
-RUN chown -R node:node /app
-USER node
+# Upgrade dependencies
+FROM builder AS upgrade
+# install dependencies
+RUN npm ci
+RUN npm install -g npm-check-updates
+CMD ["ncu", "-u", "--doctor", "--target minor"]
 
 # Test 
 FROM builder as test
@@ -29,11 +33,15 @@ RUN npm run test
 
 # Build
 FROM builder as build
+
+RUN chown -R node:node /app
+USER node
+
 RUN echo "run build"
 RUN GENERATE_SOURCEMAP=false npm run build
 
 # Deploy
 FROM nginxinc/nginx-unprivileged:mainline-alpine-slim
 COPY --from=build /app/build/. /var/www/html/
 
-COPY default.conf /etc/nginx/conf.d/
+COPY default.conf /etc/nginx/conf.d/

Makefile

@@ -4,7 +4,7 @@
 # VERSION = 2020.01.29
 .PHONY: app
 
-dc = docker-compose
+dc = docker compose
 run = $(dc) run --rm
 
 help:                               ## Show this help.
@@ -38,5 +38,5 @@ undeploy_kubectl:
 trivy:                              ## Detect image vulnerabilities
 	trivy image --ignore-unfixed nginxinc/nginx-unprivileged:mainline-alpine-slim
 
-requirements: ## Upgrade requirements (in package.json and package-lock.json) to latest versions
-	npm upgrade
+requirements:                       ## Upgrade dependencies
+	$(run) upgrade $(ARGS)

docker-compose.yml

@@ -21,3 +21,14 @@ services:
       - TZ=Europe/Amsterdam
       - BUILD_ARG=acc
     command: npm run test
+
+  upgrade:
+    build:
+      context: .
+      target: upgrade
+    environment: 
+      - TZ=Europe/Amsterdam
+    volumes:
+      - ./package.json:/app/package.json
+      - ./package-lock.json:/app/package-lock.json
+    command: ncu -u --doctor --target minor