Database, eventbus, pluginloader fixes

This commit is contained in:
peter
2019-10-31 17:43:41 +01:00
11 changed files with 100 additions and 13 deletions
+83
View File
@@ -0,0 +1,83 @@
---
kind: pipeline
type: docker
name: default
steps:
- name: build created
image: alpine
commands:
- echo ${DRONE_BUILD_CREATED}
- name: restore cache
image: drillster/drone-volume-cache
settings:
restore: true
mount:
- ./node_modules
volumes:
- name: cache
path: /cache
- name: npm install
image: node:12
commands:
- npm install
- name: npm run build
image: node:12
commands:
- npm run build
- name: rebuild cache
image: drillster/drone-volume-cache
settings:
rebuild: true
mount:
- ./node_modules
volumes:
- name: cache
path: /cache
- name: deliver dist
image: node:12
commands:
- echo ${DRONE_BUILD_CREATED}
- git clone https://www.versioncontrol.me/frontwork-distribution/${DRONE_REPO_NAME}.git; cd ${DRONE_REPO_NAME} && rm -rf ./*; cp -r ../dist/* .; cp ../LICENSE.md .
- git add --all; git -c user.email="${DRONE_COMMIT_AUTHOR_EMAIL}" -c user.name="${DRONE_COMMIT_AUTHOR}" commit --all --allow-empty --message "generated from tag ${DRONE_TAG}"
- (git tag ${DRONE_TAG} && git push --force https://$GIT_USER:$GIT_PASSWORD@www.versioncontrol.me/frontwork-distribution/${DRONE_REPO_NAME}.git master ${DRONE_TAG}) || true
environment:
GIT_USER:
from_secret: git_user
GIT_PASSWORD:
from_secret: git_password
when:
event:
- tag
- name: deliver container
image: plugins/docker
settings:
registry: registry.conatum.eu
insecure: true
repo: registry.conatum.eu/frontwork/admin
tags: ${DRONE_BUILD_CREATED}
- name: release container
image: plugins/docker
settings:
repo: frontwork/admin
tags: ${DRONE_TAG}
username: frontwork
password:
from_secret: docker_password
when:
event:
- tag
volumes:
- name: cache
host:
path: /tmp
+1 -1
View File
@@ -1,7 +1,7 @@
FROM node:12.9.0-alpine
RUN apk add git
RUN git clone https://gitea.frontblock.me/fb-dist/admin.git dist
RUN git clone https://www.versioncontrol.me/frontwork-distribution/admin.git dist
EXPOSE 8080 20000
ENTRYPOINT ["node", "dist/FrontblockAdmin.js"]
+6
View File
@@ -0,0 +1,6 @@
Non commercial license
=====================
Copyright © `2019` `frontwork.me@gmail.com`
exact license terms are to be announced. Dont steal our stuff or we sue you!!!
+3 -3
View File
@@ -4863,9 +4863,9 @@
}
},
"rpclibrary": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.4.tgz",
"integrity": "sha512-wrAAJ6cknpsoH7xrcbzheps0NgnlGrCzHPfTVHB+VgM2QAeEJfbbleDRVkFyf8bZmCJqxlEk0P1DH3xhTB2TMA==",
"version": "1.3.17",
"resolved": "https://registry.npmjs.org/rpclibrary/-/rpclibrary-1.3.17.tgz",
"integrity": "sha512-ZdhZ1TSDO+bcz5kCJ7Ol+YAAyYpwg7YI/hETS4vv3RYerUEQVZSZjcm22J5a91RnQVN2SRiXzdoXbbFb/Renog==",
"requires": {
"bsock": "^0.1.9",
"http": "0.0.0",
+1 -1
View File
@@ -37,7 +37,7 @@
"node-fetch": "^2.6.0",
"path": "^0.12.7",
"rimraf": "^3.0.0",
"rpclibrary": "^1.3.4",
"rpclibrary": "^1.3.17",
"simple-git": "^1.124.0",
"spawn-sync": "^2.0.0",
"sqlite3": "^4.1.0",
+1 -1
View File
@@ -2,7 +2,7 @@
import { getLogger } from 'frontblock-generic/Types';
import { promises as fs, mkdirSync } from "fs"
import { RPCServer } from 'rpclibrary/js/src/Backend'
import { RPCServer } from 'rpclibrary'
import { AdminConf, TableDefiniton } from './Types';
import { RPCConfigLoader } from './RPCConfigLoader';
import { RPCPluginLoader } from './PluginLoader';
+1 -2
View File
@@ -1,5 +1,4 @@
import { RPCExporter } from "rpclibrary/js/src/Interfaces";
import { SubscriptionResponse, ErrorResponse, SuccessResponse } from "rpclibrary/js/src/Types";
import { RPCExporter, SubscriptionResponse, ErrorResponse, SuccessResponse } from "rpclibrary";
import { FrontworkAdmin } from "./Admin";
import { TableDefinitionExporter } from "./Interfaces";
import { getLogger } from 'frontblock-generic/Types';
+1 -1
View File
@@ -1,4 +1,4 @@
import { Plugin } from "frontblock-generic/Plugin"
import { Plugin } from "./Plugin"
import { getLogger } from "frontblock-generic/Types"
import { FrontworkAdmin } from "./Admin";
var exec = require('child-process-promise').exec;
+1 -2
View File
@@ -1,7 +1,6 @@
import { FrontworkAdmin } from "./Admin"
import { RPC } from "rpclibrary/js/src/Types"
import { RPC, RPCExporter } from "rpclibrary"
import { TableDefiniton } from "./Types"
import { RPCExporter } from "rpclibrary/js/src/Interfaces"
import { TableDefinitionExporter } from "./Interfaces"
import { ConfigExporter } from "loadson"
+1 -1
View File
@@ -1,4 +1,4 @@
import { RPCExporter } from "rpclibrary/js/src/Interfaces";
import { RPCExporter } from "rpclibrary";
import { Git } from "upgiter"
import { FolderStatus } from "upgiter/js/src/Types";
import { Plugin } from "./Plugin";
+1 -1
View File
@@ -1,5 +1,5 @@
import { ConfigLoader } from 'loadson'
import { RPCExporter } from 'rpclibrary/js/src/Interfaces'
import { RPCExporter } from 'rpclibrary'
export type ConfigLoaderIfc<ConfT> = {
Config : {