From 5d792846ae49ed621eb2584c4ffb306e7cad55c4 Mon Sep 17 00:00:00 2001 From: Naida Vatric Date: Thu, 5 Dec 2019 22:46:50 +0100 Subject: [PATCH] Update docker file, readme and setup script --- Dockerfile | 1 + README.md | 5 ++++- package-lock.json | 41 ++++++++++++++++++++++++++++++----------- package.json | 2 +- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index f29698b..229ad19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM postgres:11.3 ENV POSTGIS_MAJOR 2.4 RUN apt-get update \ + && apt-get --assume-yes install postgresql-11-postgis-2.5-scripts\ && apt-get --assume-yes install software-properties-common postgis\ && rm -rf /var/lib/apt/lists/ diff --git a/README.md b/README.md index 2488e3c..0877e73 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ The purpose of this project is to build a web application that enables subscribi ## Setup +* Before setup please confirm that Docker is installed `docker --version`. If not install it from official site. + ### Setup with npm commands 1. Install packages @@ -24,7 +26,7 @@ this will create and run postgres image and then execute migrations `docker build -t marketalerts .` 2. Run postgres image with -`docker run --name pg_marketalerts -d -p 5432:5432 marketalerts` +`docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts` 3. Install packages `npm install` @@ -41,3 +43,4 @@ this will create and run postgres image and then execute migrations - AWS SES credentials are handled with env vratiables - Notification emails are sent in batches of 50, by using SES templates - Make sure that you are using different templates for different envirorments + diff --git a/package-lock.json b/package-lock.json index 51e7fd8..b18ae09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1396,7 +1396,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1417,12 +1418,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1437,17 +1440,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1564,7 +1570,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1576,6 +1583,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1590,6 +1598,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1597,12 +1606,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1621,6 +1632,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1701,7 +1713,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1713,6 +1726,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1798,7 +1812,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1834,6 +1849,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1853,6 +1869,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1896,12 +1913,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/package.json b/package.json index ca18f22..7b5441f 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "start": "node ./index.js", "start-mon": "nodemon ./index.js", "migrate": "cd app && npx sequelize db:migrate", - "setup": "docker build -t marketalerts . && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 4 && npm run migrate", + "setup": "docker build -t marketalerts . && docker run -e POSTGRES_USER=docker -e POSTGRES_PASSWORD=docker -e POSTGRES_DB=marketalerts --name pg_marketalerts -d -p 5432:5432 marketalerts && sleep 10 && npm run migrate", "docker-start": "docker start pg_marketalerts", "docker-stop": "docker stop pg_marketalerts", "crawl": "cd app/crawler && node npmCrawl.js",