fix(circleci): update ci

.circleci/config.yml

@@ -1,21 +1,24 @@
 orbs:
-  slack: circleci/slack@3.4.1
+  slack: circleci/slack@3.4.2 # FIXME update to v4
+  node: circleci/node@4.2.0
+  shellcheck: circleci/shellcheck@2.2.2
+  docker: circleci/docker@1.5.0
 version: 2.1
 jobs:
   test:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202101-01
     steps:
       - checkout
-      - run: docker run --name postgres -p 5432:5432 -d postgres:10.6
+      - run: docker run --name postgres -e POSTGRES_PASSWORD='5ecr3t' -p 5432:5432 -d postgres:10.16
       - run:
           name: Install Node
           command: |
-            curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-            sudo apt-get install -y nodejs
-            echo 'export PATH=/usr/bin:$PATH' >> $BASH_ENV
-            which node && node -v
-      - run: npm install
+            echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
+            echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
+            nvm install v14.16.0
+            nvm alias default v14.16.0
+      - node/install-packages
       - run: mkdir -p ~/reports/jest
       - run:
           name: Run tests
@@ -26,50 +29,56 @@ jobs:
       - store_artifacts:
           path: ~/reports
   build:
-    machine:
-      image: ubuntu-1604:201903-01
+    docker:
+      - image: cimg/base:2021.03
     steps:
       - checkout
+      - setup_remote_docker:
+          version: 20.10.2
       - run: docker-compose -f docker/docker-compose.yml -f docker/docker-compose.dev.yml build --no-cache events
   eslint:
-    machine:
-      image: ubuntu-1604:201903-01
+    docker:
+      - image: cimg/node:14.16.0
     steps:
       - checkout
-      - run:
-          name: Install Node
-          command: |
-            curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-            sudo apt-get install -y nodejs
-            echo 'export PATH=/usr/bin:$PATH' >> $BASH_ENV
-            which node && node -v
-      - run: npm install
+      - node/install-packages
       - run: mkdir -p ~/reports
       - run: npm run lint -- --format junit --output-file ~/reports/eslint.xml
       - store_test_results:
           path: ~/reports
       - store_artifacts:
           path: ~/reports
   yamllint:
-    machine:
-      image: ubuntu-1604:201903-01
+    docker:
+      - image: cimg/python:3.9.2
     steps:
       - checkout
       - run: pip install yamllint
       - run: yamllint -d .yamllint.yml .
+  shellcheck:
+    docker:
+      - image: cimg/base:2021.03
+    steps:
+      - checkout
+      - shellcheck/install
+      - shellcheck/check
+  audit:
+    docker:
+      - image: cimg/node:14.16.0
+    steps:
+      - checkout
+      - run: npm audit --production
+      - slack/status:
+          fail_only: true
+          failure_message: The audit check for \`$CIRCLE_PROJECT_REPONAME\` has failed.
   docker-build-and-push:
-    machine:
-      image: ubuntu-1604:201903-01
+    docker:
+      - image: cimg/node:14.16.0
     steps:
       - checkout
-      - run:
-          name: Install Node
-          command: |
-            curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-            sudo apt-get install -y nodejs
-            echo 'export PATH=/usr/bin:$PATH' >> $BASH_ENV
-            which node && node -v
-      - run: npm install
+      - setup_remote_docker:
+          version: 20.10.2
+      - node/install-packages
       - run: npx semantic-release
       - run: docker build  --tag aegee/events:$(node -p "require('./package.json').version") --tag aegee/events:latest -f docker/events/Dockerfile .
       - run: docker login --username $DOCKER_LOGIN --password $DOCKER_PASSWORD
@@ -81,24 +90,34 @@ jobs:
 
 workflows:
   version: 2
-  test:
-    jobs:
-      - test
-  eslint:
+  linters:
     jobs:
       - eslint
-  yamllint:
-    jobs:
       - yamllint
+      - shellcheck
+      - docker/hadolint:
+          dockerfiles: $(find . -name '*Dockerfile*')
   build:
     jobs:
       - build:
           filters:
             branches:
               ignore: master
+  test:
+    jobs:
+      - test
   docker-build-and-push:
     jobs:
       - docker-build-and-push:
           filters:
             branches:
               only: master
+  audit:
+    triggers:
+      - schedule:
+          cron: "0 0 * * 5"
+          filters:
+            branches:
+              only: master
+    jobs:
+      - audit

.eslintrc.json

@@ -4,7 +4,7 @@
       "node": true,
       "jest": true
   },
-  "extends": "airbnb",
+  "extends": "airbnb-base",
   "rules": {
       "no-underscore-dangle": "off",
       "no-param-reassign": ["error", { "props": false }],

.hadolint.yaml

@@ -0,0 +1,2 @@
+ignored:
+  - DL3025

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install commitlint --edit $1

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run lint-staged

.yamllint.yml

@@ -8,5 +8,3 @@ ignore: |
 rules:
   document-start: disable
   line-length: disable
-  truthy: disable
-  comments-indentation: disable

config/index.js

@@ -41,7 +41,7 @@ const config = {
         port: 8085,
         postgres: {
             host: 'localhost',
-            database: 'statutory-testing'
+            database: 'events-testing'
         },
         logger: {
             silent: (typeof process.env.ENABLE_LOGGING !== 'undefined') ? (!process.env.ENABLE_LOGGING) : true

docker/events/Dockerfile

@@ -1,7 +1,8 @@
-FROM node:12
+# FIXME use alpine
+FROM node:14.16.0
 
 RUN mkdir -p /usr/app/src \
-	&& mkdir -p /usr/app/media/headimages \
+	&& mkdir -p /usr/app/media \
 	&& mkdir -p /usr/app/scripts
 
 COPY ./docker/events/bootstrap.sh /usr/app/scripts/bootstrap.sh
@@ -16,8 +17,11 @@ USER node
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 ENV PATH="/home/node/.npm-global/bin:${PATH}"
 
-RUN npm install -g --loglevel warn nodemon bunyan && npm cache clean --force
-RUN npm install --loglevel warn
+# FIXME remove nodemon for production
+RUN npm install -g nodemon@2.0.7
+RUN npm install -g bunyan@1.8.15
+RUN npm cache clean --force
+RUN npm install
 
 CMD sh /usr/app/scripts/bootstrap.sh && nodemon -e "js,json" lib/run.js