refactor: removed redis + new scheduler engine
This commit is contained in:
@@ -13,4 +13,5 @@ redis:
|
||||
port: $(REDIS_PORT)
|
||||
db: $(REDIS_DB)
|
||||
password: $(REDIS_PASS)
|
||||
trustProxy: $(TRUST_PROXY)
|
||||
logLevel: info
|
||||
|
||||
@@ -7,8 +7,4 @@ db:
|
||||
user: wikijs
|
||||
pass: wikijsrocks
|
||||
db: wiki
|
||||
redis:
|
||||
host: redis
|
||||
port: 6379
|
||||
db: 0
|
||||
logLevel: info
|
||||
|
||||
@@ -3,16 +3,6 @@
|
||||
|
||||
version: "3"
|
||||
services:
|
||||
|
||||
redis:
|
||||
image: redis:4-alpine
|
||||
ports:
|
||||
- "16379:6379"
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
|
||||
db:
|
||||
image: mariadb:10.3
|
||||
environment:
|
||||
@@ -44,7 +34,6 @@ services:
|
||||
dockerfile: dev/docker-mariadb/Dockerfile
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
networks:
|
||||
- wikinet
|
||||
ports:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "Waiting for redis and mariadb to start up..."
|
||||
bash ./dev/docker-common/wait.sh redis:6379
|
||||
echo "Waiting for mariadb to start up..."
|
||||
bash ./dev/docker-common/wait.sh db:3306
|
||||
echo "=== READY ==="
|
||||
tail -f /dev/null
|
||||
|
||||
@@ -7,8 +7,4 @@ db:
|
||||
user: SA
|
||||
pass: W1kiJSR0cks!
|
||||
db: wiki
|
||||
redis:
|
||||
host: redis
|
||||
port: 6379
|
||||
db: 0
|
||||
logLevel: info
|
||||
|
||||
@@ -3,16 +3,6 @@
|
||||
|
||||
version: "3"
|
||||
services:
|
||||
|
||||
redis:
|
||||
image: redis:4-alpine
|
||||
ports:
|
||||
- "16379:6379"
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
|
||||
db:
|
||||
image: mcr.microsoft.com/mssql/server:2017-latest
|
||||
environment:
|
||||
@@ -34,7 +24,6 @@ services:
|
||||
dockerfile: dev/docker-mssql/Dockerfile
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
networks:
|
||||
- wikinet
|
||||
ports:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "Waiting for redis and mssql to start up..."
|
||||
bash ./dev/docker-common/wait.sh redis:6379
|
||||
echo "Waiting for mssql to start up..."
|
||||
bash ./dev/docker-common/wait.sh db:1433
|
||||
echo "=== READY ==="
|
||||
tail -f /dev/null
|
||||
|
||||
@@ -7,8 +7,4 @@ db:
|
||||
user: wikijs
|
||||
pass: wikijsrocks
|
||||
db: wiki
|
||||
redis:
|
||||
host: redis
|
||||
port: 6379
|
||||
db: 0
|
||||
logLevel: info
|
||||
|
||||
@@ -3,16 +3,6 @@
|
||||
|
||||
version: "3"
|
||||
services:
|
||||
|
||||
redis:
|
||||
image: redis:4-alpine
|
||||
ports:
|
||||
- "16379:6379"
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
|
||||
db:
|
||||
image: mysql:5.7
|
||||
environment:
|
||||
@@ -44,7 +34,6 @@ services:
|
||||
dockerfile: dev/docker-mysql/Dockerfile
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
networks:
|
||||
- wikinet
|
||||
ports:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "Waiting for redis and mysql to start up..."
|
||||
bash ./dev/docker-common/wait.sh redis:6379
|
||||
echo "Waiting for mysql to start up..."
|
||||
bash ./dev/docker-common/wait.sh db:3306
|
||||
echo "=== READY ==="
|
||||
tail -f /dev/null
|
||||
|
||||
@@ -7,8 +7,4 @@ db:
|
||||
user: wikijs
|
||||
pass: wikijsrocks
|
||||
db: wiki
|
||||
redis:
|
||||
host: redis
|
||||
port: 6379
|
||||
db: 0
|
||||
logLevel: info
|
||||
|
||||
@@ -3,16 +3,6 @@
|
||||
|
||||
version: "3"
|
||||
services:
|
||||
|
||||
redis:
|
||||
image: redis:4-alpine
|
||||
ports:
|
||||
- "16379:6379"
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
|
||||
db:
|
||||
image: postgres:9-alpine
|
||||
environment:
|
||||
@@ -43,7 +33,6 @@ services:
|
||||
dockerfile: dev/docker-postgres/Dockerfile
|
||||
depends_on:
|
||||
- db
|
||||
- redis
|
||||
networks:
|
||||
- wikinet
|
||||
ports:
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "Waiting for redis and postgres to start up..."
|
||||
bash ./dev/docker-common/wait.sh redis:6379
|
||||
echo "Waiting for postgres to start up..."
|
||||
bash ./dev/docker-common/wait.sh db:5432
|
||||
echo "=== READY ==="
|
||||
tail -f /dev/null
|
||||
|
||||
@@ -3,8 +3,4 @@ bindIP: 0.0.0.0
|
||||
db:
|
||||
type: sqlite
|
||||
storage: /wiki/db.sqlite
|
||||
redis:
|
||||
host: redis
|
||||
port: 6379
|
||||
db: 0
|
||||
logLevel: info
|
||||
|
||||
@@ -3,22 +3,10 @@
|
||||
|
||||
version: "3"
|
||||
services:
|
||||
|
||||
redis:
|
||||
image: redis:4-alpine
|
||||
ports:
|
||||
- "16379:6379"
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
|
||||
wiki:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: dev/docker-sqlite/Dockerfile
|
||||
depends_on:
|
||||
- redis
|
||||
networks:
|
||||
- wikinet
|
||||
ports:
|
||||
@@ -26,7 +14,6 @@ services:
|
||||
volumes:
|
||||
- .:/wiki
|
||||
- /wiki/node_modules
|
||||
command: ["sh", "./dev/docker-sqlite/init.sh"]
|
||||
|
||||
networks:
|
||||
wikinet:
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "Waiting for redis to start up..."
|
||||
bash ./dev/docker-common/wait.sh redis:6379
|
||||
echo "=== READY ==="
|
||||
tail -f /dev/null
|
||||
@@ -1,13 +1,5 @@
|
||||
version: "3"
|
||||
services:
|
||||
|
||||
redis:
|
||||
image: redis:4-alpine
|
||||
logging:
|
||||
driver: "none"
|
||||
networks:
|
||||
- wikinet
|
||||
|
||||
db:
|
||||
image: postgres:9-alpine
|
||||
environment:
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
const { Client } = require('pg')
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const yaml = require('js-yaml')
|
||||
|
||||
let config = {}
|
||||
|
||||
try {
|
||||
conf = yaml.safeLoad(
|
||||
cfgHelper.parseConfigValue(
|
||||
fs.readFileSync(path.join(process.cwd(), 'dev/docker/config.yml'), 'utf8')
|
||||
)
|
||||
)
|
||||
} catch (err) {
|
||||
console.error(err.message)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
const client = new Client({
|
||||
user: config.db.username,
|
||||
host: config.db.host,
|
||||
database: config.db.database,
|
||||
password: config.db.password,
|
||||
port: config.db.port,
|
||||
})
|
||||
|
||||
async function main () {
|
||||
await client.connect()
|
||||
await client.query('DROP SCHEMA public CASCADE;')
|
||||
await client.query('CREATE SCHEMA public;')
|
||||
await client.end()
|
||||
console.info('Success.')
|
||||
}
|
||||
|
||||
main()
|
||||
Reference in New Issue
Block a user