V2 nomos deploy docker stack

.gitignore

@@ -54,7 +54,6 @@ local.properties
 
 [Dd]ebug/
 x64/
-build/
 [Bb]in/
 [Oo]bj/
 
@@ -201,7 +200,6 @@ $RECYCLE.BIN/
 # Packages
 *.egg
 *.egg-info
-build/
 eggs/
 parts/
 var/
@@ -235,3 +233,4 @@ docker/nomos.env
 #Coverage
 coverage.xml
 coverage/.
+node_modules

README.md

@@ -4,11 +4,43 @@ _In greek mythology, Nomos is the personified spirit of law._
 
 This system in a way acts as the rule set for how things are governed, via membership levels and privileges.
 
+## Configure
+
+
+For a development configuration:
+
+`sudo npm run build`
+`sudo npm run configure`
+`sudo npm run deploy:dev`
+
+`sudo bash -c "echo '127.0.0.1 nomos.local.dev.vanhack.ca' >> /etc/hosts"`
+
+`https://nomos.local.dev.vanhack.ca/`
+
+## Cleanup
+
+```
+docker stack rm nomos_proxy
+docker stack rm nomos
+
+docker system prune
+```
+
+Optional:
+```
+# delete all stopped containers !! not just nomos, although stack rm should clean these all up anyway
+docker rm $(docker ps -aq)
+
+#delete all images !! not just nomos images, deletes everything
+docker rmi $(docker images -q)
+
+rm -rf /srv/nomos/
+```
 
 ## Development
 
 See here for complete setup, API, and philosophy:
 https://github.com/vhs/membership-manager-pro/wiki
 
 First steps should be installing your test environment:
-https://github.com/vhs/membership-manager-pro/wiki/Contributing
+https://github.com/vhs/membership-manager-pro/wiki/Contributing

adminvpn/Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu
+
+RUN apt update && apt install -y openssh-server sudo net-tools iputils-ping
+RUN mkdir /var/run/sshd
+
+RUN useradd -m -s $(which bash) -G sudo nomos
+
+COPY run.sh .
+
+EXPOSE 22
+CMD ["bash", "run.sh"]

adminvpn/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "nomos.adminvpn",
+  "version": "1.0.0",
+  "description": "",
+  "author": "Thomas LaFreniere <thomas@lafreniere.co>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/vhs/nomos.git",
+    "directory": "adminvpn"
+  },
+  "config": {
+    "build": ".0-dev"
+  },
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "test:ci": "docker run vanhack/$npm_package_name:$npm_package_version$npm_package_config_build echo",
+    "build": "docker build -t vanhack/$npm_package_name:$npm_package_version$npm_package_config_build .",
+    "push": "docker push vanhack/$npm_package_name:$npm_package_version$npm_package_config_build"
+  }
+}

adminvpn/run.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo nomos:`cat /run/secrets/adminvpn_password` | chpasswd
+
+/usr/sbin/sshd -D

build.sh

@@ -0,0 +1,38 @@
+
+cd core
+npm run build
+cd ..
+
+cd proxy
+npm run build
+cd ..
+
+cd gateway
+npm run build
+cd ..
+
+cd web
+npm run build
+cd ..
+
+cd adminvpn
+npm run build
+cd ..
+
+cd database
+cd manager
+npm run build
+cd ..
+
+cd master
+npm run build
+cd ..
+
+cd replica
+npm run build
+cd ..
+cd ..
+
+cd webhooker
+npm run build
+cd ..

build/Dockerfile

@@ -0,0 +1,8 @@
+FROM docker:18.09
+
+RUN apk add --no-cache \
+		git \
+		openssh-client \
+                nodejs \
+                npm \
+                sed

build/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "nomos.build",
+  "version": "1.0.0",
+  "description": "Build image for building nomos images in CI",
+  "author": "Thomas LaFreniere <thomas@lafreniere.co>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/vhs/nomos.git",
+    "directory": "build"
+  },
+  "config": {
+    "build": ".0-dev"
+  },
+  "main": "index.js",
+  "directories": {
+    "test": "tests"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "docker build -t vanhack/$npm_package_name:$npm_package_version$npm_package_config_build .",
+    "push": "docker push vanhack/$npm_package_name:$npm_package_version$npm_package_config_build"
+  }
+}

buildnum.version

@@ -0,0 +1 @@
+.1-dev

configure-dev.sh

@@ -0,0 +1,23 @@
+docker swarm init
+
+NODE_HOST=$(docker node inspect self | grep Hostname | grep -oEi '[a-z]+' | tail -n 1)
+
+STORAGE_NODE_MASTER=$NODE_HOST
+STORAGE_NODE_REPLICA=$NODE_HOST
+
+docker node ls
+
+# specify master storage node, this is the node which will have master database affinity
+docker node update --label-add nomos.persistence.master=storage $STORAGE_NODE_MASTER
+# this path is required on the master node
+mkdir -p /srv/nomos/storage/master
+
+# specify replica storage node, this is the node which will have replica database affinity
+docker node update --label-add nomos.persistence.replica=storage $STORAGE_NODE_REPLICA
+# this path is required on the replica node
+mkdir -p /srv/nomos/storage/replica
+
+docker network inspect proxy || docker network create --driver overlay proxy
+docker network inspect admin || docker network create --driver overlay admin
+
+echo "add to /etc/hosts: 127.0.0.1 nomos.local.dev.vanhack.ca"

core/Dockerfile

@@ -0,0 +1,9 @@
+FROM php:fpm
+
+ADD . .
+
+RUN apt update && apt install -y zip
+RUN docker-php-ext-install bcmath
+RUN docker-php-ext-install mysqli
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=.
+RUN php composer.phar install

app/app.php → core/app/app.php

@@ -12,6 +12,9 @@
 if (DEBUG) {
     error_reporting(E_ALL);
     ini_set("display_errors", 1);
+} else {
+    error_reporting(0);
+    ini_set("display_errors", 0);
 }
 
 require_once("include.php");

app/services/EmailService.php → core/app/services/EmailService.php

@@ -197,7 +197,7 @@ public function DeleteTemplate($id)
      */
     public function ListTemplates($page, $size, $columns, $order, $filters)
     {
-        return EmailTemplate::page($page, $size, $columns, $order, $filters);
+        return EmailTemplate::page($page, $size, $columns, $order, $filters, []);
     }
 
     /**