chore(wikijs): fix db connection
This commit is contained in:
parent
bba2ea28ac
commit
e73f535bb3
|
@ -16,9 +16,9 @@
|
||||||
"form_fields": [
|
"form_fields": [
|
||||||
{
|
{
|
||||||
"type": "random",
|
"type": "random",
|
||||||
"label": "DB_PASS",
|
"label": "WIKI_JS_DB_PASS",
|
||||||
"min": 32,
|
"min": 32,
|
||||||
"env_variable": "DB_PASS"
|
"env_variable": "WIKI_JS_DB_PASS"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,28 +1,17 @@
|
||||||
version: "3"
|
version: '3.7'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
wikijs-db:
|
|
||||||
image: postgres:11-alpine
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: wiki
|
|
||||||
POSTGRES_PASSWORD: ${DB_PASS}
|
|
||||||
POSTGRES_USER: wikijs
|
|
||||||
logging:
|
|
||||||
driver: "none"
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- db-data:/var/lib/postgresql/data
|
|
||||||
|
|
||||||
wikijs:
|
wikijs:
|
||||||
|
container_name: wikijs
|
||||||
image: ghcr.io/requarks/wiki:2.5.297
|
image: ghcr.io/requarks/wiki:2.5.297
|
||||||
depends_on:
|
depends_on:
|
||||||
- wikijs-db
|
- wikijs-db
|
||||||
environment:
|
environment:
|
||||||
DB_TYPE: postgres
|
DB_TYPE: postgres
|
||||||
DB_HOST: db
|
DB_HOST: wikijs-db
|
||||||
DB_PORT: 5432
|
DB_PORT: 5432
|
||||||
DB_USER: wikijs
|
DB_USER: wikijs
|
||||||
DB_PASS: ${DB_PASS}
|
DB_PASS: ${WIKI_JS_DB_PASS}
|
||||||
DB_NAME: wiki
|
DB_NAME: wiki
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
@ -36,3 +25,18 @@ services:
|
||||||
traefik.http.routers.wikijs.service: wikijs
|
traefik.http.routers.wikijs.service: wikijs
|
||||||
traefik.http.routers.wikijs.tls.certresolver: myresolver
|
traefik.http.routers.wikijs.tls.certresolver: myresolver
|
||||||
traefik.http.services.wikijs.loadbalancer.server.port: 3000
|
traefik.http.services.wikijs.loadbalancer.server.port: 3000
|
||||||
|
|
||||||
|
wikijs-db:
|
||||||
|
container_name: wikijs-db
|
||||||
|
image: postgres:11-alpine
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: wiki
|
||||||
|
POSTGRES_PASSWORD: ${WIKI_JS_DB_PASS}
|
||||||
|
POSTGRES_USER: wikijs
|
||||||
|
logging:
|
||||||
|
driver: 'none'
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- tipi_main_network
|
||||||
|
volumes:
|
||||||
|
- ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
|
||||||
|
|
|
@ -1,24 +1,20 @@
|
||||||
[](https://camo.githubusercontent.com/620ef2ce5831c2e1a03aaa55721d0eb9be6c5fb678a284a9dd5ad4976413974f/68747470733a2f2f7374617469632e7265717561726b732e696f2f6c6f676f2f77696b696a732d66756c6c2e737667)
|
[](https://camo.githubusercontent.com/620ef2ce5831c2e1a03aaa55721d0eb9be6c5fb678a284a9dd5ad4976413974f/68747470733a2f2f7374617469632e7265717561726b732e696f2f6c6f676f2f77696b696a732d66756c6c2e737667)
|
||||||
|
|
||||||
[](https://github.com/Requarks/wiki/releases) [](https://github.com/requarks/wiki/blob/master/LICENSE) [](http://standardjs.com/) [](https://github.com/Requarks/wiki/releases) [](https://hub.docker.com/r/requarks/wiki/)
|
|
||||||
[](https://github.com/Requarks/wiki/actions/workflows/build.yml) [](https://huntr.dev/bounties/disclose) [](https://github.com/users/NGPixel/sponsorship) [](https://opencollective.com/wikijs) [](https://blog.js.wiki/subscribe)
|
|
||||||
[](https://wiki.requarks.io/slack) [](https://twitter.com/requarks) [](https://t.me/wiki_js) [](https://discord.gg/rcxt9QS2jd) [](https://www.reddit.com/r/wikijs/)
|
|
||||||
|
|
||||||
##### [](https://github.com/requarks/wiki/blob/main/README.md#a-modern-lightweight-and-powerful-wiki-app-built-on-nodejs)A modern, lightweight and powerful wiki app built on NodeJS
|
##### [](https://github.com/requarks/wiki/blob/main/README.md#a-modern-lightweight-and-powerful-wiki-app-built-on-nodejs)A modern, lightweight and powerful wiki app built on NodeJS
|
||||||
|
|
||||||
- **[Official Website](https://js.wiki/)**
|
- **[Official Website](https://js.wiki/)**
|
||||||
- **[Documentation](https://docs.requarks.io/)**
|
- **[Documentation](https://docs.requarks.io/)**
|
||||||
- [Requirements](https://docs.requarks.io/install/requirements)
|
- [Requirements](https://docs.requarks.io/install/requirements)
|
||||||
- [Installation](https://docs.requarks.io/install)
|
- [Installation](https://docs.requarks.io/install)
|
||||||
- [Demo](https://docs.requarks.io/demo)
|
- [Demo](https://docs.requarks.io/demo)
|
||||||
- [Changelog](https://github.com/requarks/wiki/releases)
|
- [Changelog](https://github.com/requarks/wiki/releases)
|
||||||
- [Feature Requests](https://feedback.js.wiki/wiki)
|
- [Feature Requests](https://feedback.js.wiki/wiki)
|
||||||
- [Chat with us on Slack](https://wiki.requarks.io/slack)
|
- [Chat with us on Slack](https://wiki.requarks.io/slack)
|
||||||
- [Translations](https://docs.requarks.io/dev/translations) _(We need your help!)_
|
- [Translations](https://docs.requarks.io/dev/translations) _(We need your help!)_
|
||||||
- [E2E Testing Results](https://dashboard.cypress.io/projects/r7qxah/runs)
|
- [E2E Testing Results](https://dashboard.cypress.io/projects/r7qxah/runs)
|
||||||
- [Special Thanks](https://github.com/requarks/wiki/blob/main/README.md#special-thanks)
|
- [Special Thanks](https://github.com/requarks/wiki/blob/main/README.md#special-thanks)
|
||||||
- [Contribute](https://github.com/requarks/wiki/blob/main/README.md#contributors)
|
- [Contribute](https://github.com/requarks/wiki/blob/main/README.md#contributors)
|
||||||
|
|
||||||
[Follow our Twitter feed](https://twitter.com/requarks) to learn about upcoming updates and new releases!
|
[Follow our Twitter feed](https://twitter.com/requarks) to learn about upcoming updates and new releases!
|
||||||
|
|
||||||
## [](https://github.com/requarks/wiki/blob/main/README.md#donate)
|
## [](https://github.com/requarks/wiki/blob/main/README.md#donate)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user