update base image and dependencies

Author: eisbilir

.circleci/config.yml

@@ -20,6 +20,15 @@ install_deploysuite: &install_deploysuite
     cp ./../buildscript/master_deploy.sh .
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
+
+restore_cache_settings_for_build: &restore_cache_settings_for_build
+  key: docker-node-modules-{{ checksum "yarn.lock" }}
+
+save_cache_settings: &save_cache_settings
+  key: docker-node-modules-{{ checksum "yarn.lock" }}
+  paths:
+    - node_modules
+
 run_build: &run_build
   name: Installation of build dependencies.
   command: ./build.sh
@@ -35,9 +44,12 @@ jobs:
     - setup_remote_docker
     - run: *install_dependency
     - run: *install_deploysuite
+    - restore_cache: *restore_cache_settings_for_build
     - run: *run_build
+    - save_cache: *save_cache_settings
 
     - deploy:
+        name: Running MasterScript.
         command: "./awsconfiguration.sh DEV\nsource awsenvconf \n./buildenv.sh -e DEV -b submission-processor-es_deployvar\nsource buildenvvar\n./master_deploy.sh -d ECS -e DEV -t latest -s dev-global-appvar,submission-processor-es_appvar -i submission-processor-es\n#magic___^_^___line\n#magic___^_^___line\n"
   "build-prod":
     !!merge <<: *defaults
@@ -47,8 +59,11 @@ jobs:
     - setup_remote_docker
     - run: *install_dependency
     - run: *install_deploysuite
+    - restore_cache: *restore_cache_settings_for_build
     - run: *run_build
+    - save_cache: *save_cache_settings
     - deploy:
+        name: Running MasterScript.
         command: "./awsconfiguration.sh PROD\nsource awsenvconf \n./buildenv.sh -e PROD -b submission-processor-es_deployvar\nsource buildenvvar\n./master_deploy.sh -d ECS -e PROD -t latest -s prod-global-appvar,submission-processor-es_appvar -i submission-processor-es\n"
 workflows:
   version: 2

.eslintrc.yml

@@ -0,0 +1,9 @@
+env:
+  browser: true
+  commonjs: true
+  es2021: true
+  mocha: true
+extends: standard
+parserOptions:
+  ecmaVersion: latest
+rules: {}

README.md

@@ -4,7 +4,7 @@ This processor only writes to ElasticSearch. It deals with the create, update an
 
 ## Dependencies
 
-- nodejs https://nodejs.org/en/ (v8+)
+- nodejs https://nodejs.org/en/ (v18+)
 - Kafka
 - ElasticSearch
 - Docker, Docker Compose

build.sh

@@ -1,13 +1,22 @@
 #!/bin/bash
 set -eo pipefail
-#ENV=$1
-#AWS_ACCOUNT_ID=$(eval "echo \$${ENV}_AWS_ACCOUNT_ID")
-#AWS_REGION=$(eval "echo \$${ENV}_AWS_REGION")
-#AWS_REPOSITORY=$(eval "echo \$${ENV}_AWS_REPOSITORY") 
-
-# Builds Docker image of the app.
-#TAG=$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$AWS_REPOSITORY:$CIRCLE_BUILD_NUM
-#sed -i='' "s|submission-processor-es:latest|$TAG|" docker/docker-compose.yml
+UPDATE_CACHE=""
 echo "" > docker/api.env
 docker-compose -f docker/docker-compose.yml build submission-processor-es
-docker images
+docker create --name app submission-processor-es:latest
+
+if [ -d node_modules ]
+then
+  mv yarn.lock old-yarn.lock
+  docker cp app:/submission-processor-es/yarn.lock yarn.lock
+  set +eo pipefail
+  UPDATE_CACHE=$(cmp yarn.lock old-yarn.lock)
+  set -eo pipefail
+else
+  UPDATE_CACHE=1
+fi
+
+if [ "$UPDATE_CACHE" == 1 ]
+then
+  docker cp app:/submission-processor-es/node_modules .
+fi

docker/Dockerfile

@@ -1,5 +1,5 @@
-# Use the base image with Node.js 8.11.3
-FROM node:8.11.3
+# Use the base image with Node.js 18.16.1
+FROM node:18.16.1
 
 # Copy the current directory into the Docker image
 COPY . /submission-processor-es
@@ -8,5 +8,5 @@ COPY . /submission-processor-es
 WORKDIR /submission-processor-es
 
 # Install the dependencies from package.json
-RUN npm install
-CMD npm start
+RUN yarn install
+CMD node src/app.js