Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/acorn-7.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
XVincentX authored Jul 16, 2020
2 parents 504d0e4 + a53844b commit cbdc2e9
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8-alpine
FROM node:10-alpine

LABEL maintainer Vincenzo Chianese, [email protected]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-master
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8-alpine
FROM node:10-alpine

ENV NODE_ENV production

Expand Down
29 changes: 21 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cbdc2e9

Please sign in to comment.