Merge pull request #201 from adhocteam/nodejs-update

Nodejs & yarn updates

.circleci/config.yml

@@ -5,10 +5,10 @@ executors:
   docker-executor:
     # for docker you must specify an image to use for the primary container
     docker:
-      - image: circleci/node:12.20.0-browsers
+      - image: circleci/node:14.15.4-browsers
   docker-postgres-executor:
     docker:
-      - image: circleci/node:12.20.0-browsers
+      - image: circleci/node:14.15.4-browsers
         environment:
           DATABASE_URL: postgresql://postgres@localhost/ttasmarthub
       - image: circleci/postgres:12.4-ram
@@ -133,7 +133,7 @@ parameters:
     default: "main"
     type: string
   sandbox_git_branch:  # change to feature branch to test deployment
-    default: "cm-fix-tls-for-redis"
+    default: "nodejs-update"
     type: string
 jobs:
   build_and_lint:
@@ -144,15 +144,15 @@ jobs:
       - restore_cache:
           keys:
             # To manually bust the cache, increment the version e.g. v3-yarn...
-            - v2-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
+            - v3-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
             # If checksum is new, restore partial cache
-            - v2-yarn-deps-
+            - v3-yarn-deps-
       - run: yarn deps
       - save_cache:
           paths:
             - node_modules
             - frontend/node_modules
-          key: v2-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
+          key: v3-yarn-deps-{{ checksum "combined-yarnlock.txt" }}
       - run:
           name: Lint backend
           command: yarn lint:ci

.nvmrc

@@ -1 +1 @@
-12.20.0
+14.15.4

Dockerfile

@@ -1,2 +1,2 @@
-FROM node:12.20.0
+FROM node:14.15.4
 WORKDIR /app

README.md

@@ -28,10 +28,14 @@ For the latest on our product mission, goals, initiatives, and KPIs, see the [Pr
 ## Getting Started
 
 ### Set up
+
+*Warning* when using Docker to run either the full app or the backend services, PostgreSQL (5432) and Redis (6379) are both configured to bind to their well-known ports. This will fail if any other instances of
+those services are already running on your machine.
+
 #### Docker
 
 1. Make sure Docker is installed. To check run `docker ps`.
-2. Make sure you have Node 12.20.0 installed.
+2. Make sure you have Node 14.15.4 installed.
 3. Run `yarn docker:deps`. This builds the frontend and backend docker containers and install dependencies. You only need to run this step the first time you fire up the app and when dependencies are added/updated/removed.
 4. Copy `.env.example` to `.env`.  
 6. Change the `AUTH_CLIENT_ID` and `AUTH_CLIENT_SECRET` variables to to values found in the "Values for local development" section of the "Development Credentials" document. If you don't have access to this document, please ask in the hs-vendors-ohs-tta channel of the gsa-tts slack channel.
@@ -68,9 +72,11 @@ You may run into some issues running the docker commands on Windows:
 |-|-|-|-|
 | `yarn docker:deps` | Install dependencies for the frontend and backend | `yarn deps` | `yarn deps:local` |
 | `yarn docker:start` | Starts the backend and frontend | | `yarn start:local` |
-| `yarn docker:stop` | Stops the backend and frontend | |
-| `yarn docker:test` | Runs tests for the frontend and backend | |
-| `yarn docker:lint` | Runs the linter for the frontend and backend | |
+| `yarn docker:stop` | Stops the backend and frontend | | |
+| `yarn docker:dbs:start` | Start only the supporting services | | |
+| `yarn docker:dbs:stop` | Stop only the supporting services | | |
+| `yarn docker:test` | Runs tests for the frontend and backend | | |
+| `yarn docker:lint` | Runs the linter for the frontend and backend | | |
 | `yarn docker:db:migrate` | Run migrations in docker containers | `yarn db:migrate` | |
 | `yarn docker:db:migrate:undo` | Undo migrations in docker containers | `yarn db:migrate:undo` | |
 | `yarn docker:db:seed` | Run all seeders located in `src/seeders` | `yarn db:seed` | |

bin/run-tests

@@ -17,17 +17,39 @@ check_exit() {
 
 main() {
     local opt=""
+    local docker="true"
 
-    for o in "${options[@]}"; do
-        if [[ "${1}" == "$o"  ]]; then
-            opt="$o";
-        fi
+    while [[ $# -gt 0 ]]
+    do
+      key="$1"
+      case "$key" in
+        -l|--local)
+          docker="false"
+          shift
+          ;;
+        *)
+          for o in "${options[@]}"; do
+            if [[ "$key" == "$o"  ]]; then
+                opt="$o";
+            fi
+          done
+          shift
+          ;;
+      esac
     done
 
     log "Running tests in using test config 'docker-compose.test.yml'"
     # Start containers
-    docker-compose -f 'docker-compose.test.yml' up -d
-    check_exit "$?"
+    if [[ $docker == "true" ]]; then
+      docker-compose -f 'docker-compose.test.yml' up -d
+      check_exit "$?"
+    else
+      docker-compose -f 'docker-compose.test.yml' up -d test-db
+      check_exit "$?"
+      IFS=: read host port <<< "$(docker-compose -f 'docker-compose.test.yml' port test-db 5432)"
+      echo "Postgres is running on port $port"
+      export POSTGRES_PORT=$port
+    fi
 
     # Let postgres initialize
     echo
@@ -37,24 +59,39 @@ main() {
     # Migrate and seed db
     echo
     log "Migrating & seeding db"
-    docker exec test-backend bash -c "yarn db:migrate"
-    check_exit "$?"
-    docker exec test-backend bash -c "yarn db:seed;"
-    check_exit "$?"
+    if [[ $docker == "true" ]]; then
+      docker exec test-backend bash -c "yarn db:migrate"
+      check_exit "$?"
+      docker exec test-backend bash -c "yarn db:seed"
+      check_exit "$?"
+    else
+      yarn db:migrate
+      check_exit "$?"
+      yarn db:seed
+      check_exit "$?"
+    fi
 
     if [[ "$opt" == "backend" || -z "$opt" ]]; then
         # Test backend
         echo
         log "Running backend tests"
-        docker exec test-backend bash -c "yarn test:ci"
+        if [[ $docker == "true" ]]; then
+          docker exec test-backend bash -c "yarn test:ci"
+        else
+          yarn test:ci
+        fi
         check_exit "$?"
     fi
 
     if [[ "$opt" == "frontend" || -z "$opt" ]]; then
         # Test frontend
         echo
         log "Running frontend tests"
-        docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
+        if [[ $docker == "true" ]]; then
+          docker exec test-frontend bash -c "yarn --cwd frontend run test:ci"
+        else
+          yarn --cwd frontend run test:ci
+        fi
         check_exit "$?"
     fi
 

config/config.js

@@ -5,14 +5,16 @@ module.exports = {
     username: process.env.POSTGRES_USERNAME,
     password: process.env.POSTGRES_PASSWORD,
     database: process.env.POSTGRES_DB,
-    host: process.env.POSTGRES_HOST,
+    host: (process.env.POSTGRES_HOST || 'localhost'),
+    port: (process.env.POSTGRES_PORT || 5432),
     dialect: 'postgres',
   },
   test: {
     username: process.env.POSTGRES_USERNAME,
     password: process.env.POSTGRES_PASSWORD,
     database: process.env.POSTGRES_DB,
-    host: process.env.POSTGRES_HOST,
+    host: (process.env.POSTGRES_HOST || 'localhost'),
+    port: (process.env.POSTGRES_PORT || 5432),
     dialect: 'postgres',
     logging: false,
   },
@@ -22,6 +24,7 @@ module.exports = {
     password: process.env.POSTGRES_PASSWORD,
     database: process.env.POSTGRES_DB,
     host: process.env.POSTGRES_HOST,
+    port: (process.env.POSTGRES_PORT || 5432),
     dialect: 'postgres',
   },
 };

docker-compose.dss.yml

@@ -28,8 +28,6 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: secretpass
       POSTGRES_DB: ttasmarthub
-    ports:
-      - "6543:5432"
     networks:
       - smarthub
 networks:

docker-compose.override.yml

@@ -0,0 +1,43 @@
+version: "3.5"
+services:
+  backend:
+    build:
+      context: .
+    command: yarn server
+    user: ${CURRENT_USER:-root}
+    ports:
+      - "8080:8080"
+    depends_on:
+      - db
+      - redis
+    environment:
+      - POSTGRES_HOST=postgres_docker
+      - REDIS_HOST=redis
+    volumes:
+      - ".:/app:rw"
+  frontend:
+    build:
+      context: .
+    command: yarn start
+    user: ${CURRENT_USER:-root}
+    stdin_open: true
+    ports:
+      - "3000:3000"
+    volumes:
+      - "./frontend:/app:rw"
+      - "./scripts:/app/scripts"
+    environment:
+      - BACKEND_PROXY=http://backend:8080
+  worker:
+    build:
+      context: .
+    command: yarn worker
+    env_file: .env
+    depends_on:
+      - db
+      - redis
+    environment:
+      - POSTGRES_HOST=postgres_docker
+      - REDIS_HOST=redis
+    volumes:
+      - ".:/app:rw"

docker-compose.test.yml

@@ -33,6 +33,8 @@ services:
     image: postgres:12.4
     container_name: test-db
     env_file: .env
+    ports:
+      - "5432"
     networks:
       - ttadp-test
 # Use non-default network so we don't conflict with the developer environment

docker-compose.yml

@@ -8,53 +8,12 @@ services:
       - "./docs/openapi/:/usr/share/nginx/html/swagger/"
     environment:
       - SPEC_URL=swagger/index.yaml
-  backend:
-    build:
-      context: .
-    command: yarn server
-    user: ${CURRENT_USER:-root}
-    ports:
-      - "8080:8080"
-    depends_on:
-      - db
-      - redis
-    environment:
-      - POSTGRES_HOST=postgres_docker
-      - REDIS_HOST=redis
-    volumes:
-      - ".:/app:rw"
-  frontend:
-    build:
-      context: .
-    command: yarn start
-    user: ${CURRENT_USER:-root}
-    stdin_open: true
-    ports:
-      - "3000:3000"
-    volumes:
-      - "./frontend:/app:rw"
-      - "./scripts:/app/scripts"
-    environment:
-      - BACKEND_PROXY=http://backend:8080
-  worker:
-    build:
-      context: .
-    command: yarn worker
-    env_file: .env
-    depends_on:
-      - db
-      - redis
-    environment:
-      - POSTGRES_HOST=postgres_docker
-      - REDIS_HOST=redis
-    volumes:
-      - ".:/app:rw"
   db:
     image: postgres:12.4
     container_name: postgres_docker
     env_file: .env
     ports:
-      - "6543:5432"
+      - "5432:5432"
     volumes:
       - dbdata:/var/lib/postgresql/data
   minio:
@@ -71,10 +30,14 @@ services:
     command: ["--endpoint-url", "$S3_ENDPOINT", "s3api", "create-bucket", "--bucket", "$S3_BUCKET"]
   clamav-rest:
     image: ajilaag/clamav-rest
+    ports:
+      - "9443:9443"
   redis:
     image: redis:5.0.6-alpine
     command: ['redis-server', '--requirepass', '$REDIS_PASS']
     env_file: .env
+    ports:
+      - "6379:6379"
 volumes:
   dbdata: {}
   miniodata: {}