Upgraded package.json (#31)

Author: chrisleekr

.github/workflows/main.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
       - name: Checkout source code
         uses: actions/checkout@master
-      - name: set inotify
+      - name: Set inotify
         run: |
           echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-      - name: docker hub login
+      - name: Login DockerHub
         run: |
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin $REGISTRY_DOMAIN
       - name: Build api dev image
@@ -40,6 +40,18 @@ jobs:
           cd backend
           docker build . --target build-stage --build-arg NODE_ENV=development --build-arg BASE_URL=/backend/ -t $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
           docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
+      - name: Lint Dockerfile for api
+        uses: hadolint/[email protected]
+        with:
+          dockerfile: api/Dockerfile
+      - name: Lint Dockerfile for frontend-nuxt
+        uses: hadolint/[email protected]
+        with:
+          dockerfile: frontend-nuxt/Dockerfile
+      - name: Lint Dockerfile for vue
+        uses: hadolint/[email protected]
+        with:
+          dockerfile: frontend-vue/Dockerfile
       - name: Run docker compose for dev
         run: |
           docker-compose -f docker-compose.actions.yml pull

.gitlab-ci.yml

@@ -63,6 +63,14 @@ build-backend:
       $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
     - docker push $REGISTRY_DOMAIN/chrisleekr/nodejs-vuejs-mysql-boilerplate:backend-dev
 
+lint-dockerfile:
+  stage: testing
+  image: hadolint/hadolint:latest
+  script:
+    - hadolint api/Dockerfile
+    - hadolint frontend-nuxt/Dockerfile
+    - hadolint frontend-vue/Dockerfile
+
 testing-and-linting:
   stage: testing
   image: docker/compose:latest

.vscode/settings.json

@@ -19,6 +19,7 @@
     "source.fixAll.eslint": true
   },
   "cSpell.words": [
+    "hadolint",
     "mailhog",
     "nuxt"
   ]

api/Dockerfile

@@ -1,12 +1,16 @@
 # development stage
-FROM node:13-alpine AS dev-stage
+FROM node:16-alpine3.13 AS dev-stage
 
-RUN apk update && apk add --no-cache python make g++ mysql-client
+RUN apk update && \
+  apk add --no-cache \
+  python3=3.8.10-r0 \
+  make=4.3-r0 \
+  g++=10.2.1_pre1-r3 \
+  mysql-client=10.5.11-r0
 
 # Add configuration files
 COPY image-files/ /
 
-
 WORKDIR /srv
 
 COPY package*.json ./
@@ -24,15 +28,14 @@ CMD [ "npm", "run", "dev" ]
 # build stage
 FROM dev-stage AS build-stage
 
-
-RUN npm install --production
-
-RUN npm run build
+RUN npm install --production && \
+  npm run build && \
+  npm audit fix
 
 # production stage
-FROM node:13-alpine AS production-stage
+FROM node:16-alpine3.13 AS production-stage
 
-RUN apk update && apk add --no-cache mysql-client
+RUN apk update && apk add --no-cache mysql-client=10.5.10-r0
 
 # Add configuration files
 COPY image-files/ /