Merge remote-tracking branch 'origin/master' into mongo4

.dockerignore

@@ -0,0 +1 @@
+node_modules

Gruntfile.js

@@ -71,7 +71,7 @@ module.exports = function (grunt) {
                 command: () => {
                     const error = 'Version defined in Dockerfile is not matching package version of node.';
                     const pkgVersion = grunt.template.process('<%= pkg.engines.node %>');
-                    const dockerParse = "sed -n -e '/^ARG NODE_TAG/ s/.*=//p' Dockerfile";
+                    const dockerParse = "sed -n -e '/^ARG NODE_TAG/ s/.*=//p' ./docker/Dockerfile";
 
                     return 'if [ "$(' + dockerParse + ')" != "' + pkgVersion + '" ]; then echo "' + error + '"; exit 1; fi;';
                 },

README.md

@@ -18,6 +18,10 @@ We welcome any keen developer in helping us build the better PastVu. You can ins
 You need to have [docker](https://docs.docker.com/engine/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed.
 
 ```bash
+# Start Mongo container in background
+docker-compose up -d mongo
+# Import Pastvu database
+docker-compose exec mongo initdb
 # Install node modules
 docker-compose run app npm install
 # Start the application

bin/run.js

@@ -42,6 +42,10 @@ if (require.main !== module) { // If run.js is required by another module (for e
             describe: 'Log config',
             'default': true,
         })
+        .options('primary', {
+            boolean: true,
+            describe: 'Run as primary instance',
+        })
         .argv;
 
     const config = require('../config');
@@ -53,6 +57,8 @@ if (require.main !== module) { // If run.js is required by another module (for e
 
     const appName = path.parse(argv.script).name;
     const logger = log4js.getLogger(appName);
+    if (appName === "notifier") config.notifier = true;
+    config.primary = !!argv.primary; // If not true, the instance will run as a recplica
 
     // Handling uncaught exceptions
     process.on('uncaughtException', err => {

config/default.config.js

@@ -5,8 +5,6 @@ module.exports = {
     env: 'development', // Enviroment: development, testing, production
     locales: ['en', 'ru'], // List of supported locales. First one is the default locale, if user transferred nothing
     lang: 'ru', // Language: ru, en
-    notifier: false, // If true, send periodical emails to users
-    primary: false, // If not true, the instance will run as a recplica
     admin: {
         email: '',
     },
@@ -49,7 +47,6 @@ module.exports = {
     servePublic: true, // Tell app.js serve out its public folder (js, css, etc)
     serveStore: true, // Tell app.js serve out store public folder
 
-    logPath: '', // Folder for logs. Setting that property will enable log to files in logPath (relative to project dir). By default it is off
     logLongDuration: ms('2s'),
     serveLog: false, // Tell app.js serve out its logs folder (path: "logPath") at /nodelog
     serveLogAuth: {

config/local.config.js.docker-example

@@ -3,8 +3,6 @@ module.exports = function (config, appRequire) {
 
     _.merge(config, {
         // Send periodical emails to users depending on environment variable
-        notifier: true,
-        primary: true,
         client: {
             hostname: 'localhost',
         },

config/local.config.js.example

@@ -2,8 +2,6 @@ module.exports = function (config, appRequire) {
     const _ = appRequire('lodash');
 
     _.merge(config, {
-        notifier: true, // Send periodical emails to user
-        primary: true,
         client: {
             hostname: 'pastvu.local',
         },

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 
 x-defaults: &app-image
-  build: .
+  build: ./docker
   image: pastvu_node
   environment:
     - NODE_ENV=development
@@ -11,6 +11,7 @@ services:
     image: mongo:4.4
     volumes:
       - mongo:/data/db
+      - ./docker/dev-initdb.sh:/usr/local/bin/initdb
     expose:
       - "27017"
     ports:
@@ -35,7 +36,7 @@ services:
     volumes:
       - .:/code
       - store:/store
-    command: run app
+    command: run app --primary
 
   worker:
     << : *app-image

docker/Dockerfile

@@ -0,0 +1,11 @@
+ARG NODE_TAG=16.10.0
+FROM node:$NODE_TAG
+RUN apt-get update && apt-get install -y \
+    graphicsmagick \
+    webp \
+&& rm -rf /var/lib/apt/lists/*
+COPY ./imagick-policy.xml /etc/ImageMagick-6/policy.xml
+WORKDIR /code
+COPY ./dev-entrypoint.sh /usr/local/bin/
+USER node
+ENTRYPOINT ["dev-entrypoint.sh"]

docker/backend.Dockerfile

@@ -15,11 +15,9 @@ COPY . .
 RUN npm run build
 
 FROM base
-ENV LANG ru
-ENV MODULE app
 ENV NODE_ENV production
-ENV CONFIG /config.js
 COPY --from=builder /appBuild/ .
-COPY ./docker/docker-healthcheck.sh .
 RUN npm install --production
+RUN mkdir /store && chown node:node /store
+USER node
 CMD ["bin/run"]

docker/dev-entrypoint.sh

@@ -8,7 +8,6 @@ CONFIG="./config/local.config.js"
 # 'run MODULE [options]' special command to run script directly with node, so that system signals are relayed to the process.
 if [ "$1" = 'run' -a -f "./${2}.js" ]; then
   MODULE=$2
-  wait-for-it -t 0 mongo:27017
   shift 2
   exec node ./bin/run.js --script "./${MODULE}.js" "$@"
 fi

docker/dev-initdb.sh

@@ -1,4 +1,13 @@
 #!/bin/sh
-curl -s -o /tmp/pastvu.gz https://varlamov.me/pastvu/github/pastvu.gz
-mongorestore --gzip --db pastvu --archive=/tmp/pastvu.gz
-rm /tmp/pastvu.gz
+
+# This test database restore script is designed to be bind mounted inside mongo
+# container at /usr/local/bin/initdb location, then called on started container as
+# 'docker-compose exec mongo initdb'.
+if ! command -v curl; then
+    echo "Installing curl"
+    apt update -qq  && apt-get install -yqq curl
+fi
+echo "Downloading db dump..."
+curl --progress-bar -o /tmp/pastvu.gz https://varlamov.me/pastvu/github/pastvu.gz
+mongorestore --drop --gzip --db pastvu --archive=/tmp/pastvu.gz
+rm /tmp/pastvu.gz

package.json

@@ -1,6 +1,6 @@
 {
     "name": "pastvu",
-    "version": "1.4.4",
+    "version": "1.4.7",
     "description": "Retrospective topography of media content",
     "homepage": "https://github.com/pastvu/pastvu",
     "keywords": [