From e73f535bb3db2b885565b1c9fe7b49296e076f18 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Sat, 11 Mar 2023 16:38:57 +0100 Subject: [PATCH] chore(wikijs): fix db connection --- apps/wikijs/config.json | 4 ++-- apps/wikijs/docker-compose.yml | 36 ++++++++++++++++------------- apps/wikijs/metadata/description.md | 30 +++++++++++------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps/wikijs/config.json b/apps/wikijs/config.json index 265574c0..0efce7f6 100644 --- a/apps/wikijs/config.json +++ b/apps/wikijs/config.json @@ -16,9 +16,9 @@ "form_fields": [ { "type": "random", - "label": "DB_PASS", + "label": "WIKI_JS_DB_PASS", "min": 32, - "env_variable": "DB_PASS" + "env_variable": "WIKI_JS_DB_PASS" } ] } diff --git a/apps/wikijs/docker-compose.yml b/apps/wikijs/docker-compose.yml index 123708e1..e76dc84b 100644 --- a/apps/wikijs/docker-compose.yml +++ b/apps/wikijs/docker-compose.yml @@ -1,28 +1,17 @@ -version: "3" +version: '3.7' + 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: + container_name: wikijs image: ghcr.io/requarks/wiki:2.5.297 depends_on: - wikijs-db environment: DB_TYPE: postgres - DB_HOST: db + DB_HOST: wikijs-db DB_PORT: 5432 DB_USER: wikijs - DB_PASS: ${DB_PASS} + DB_PASS: ${WIKI_JS_DB_PASS} DB_NAME: wiki restart: unless-stopped ports: @@ -36,3 +25,18 @@ services: traefik.http.routers.wikijs.service: wikijs traefik.http.routers.wikijs.tls.certresolver: myresolver 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 diff --git a/apps/wikijs/metadata/description.md b/apps/wikijs/metadata/description.md index f5050b84..088edbff 100644 --- a/apps/wikijs/metadata/description.md +++ b/apps/wikijs/metadata/description.md @@ -1,24 +1,20 @@ [![Wiki.js](https://camo.githubusercontent.com/620ef2ce5831c2e1a03aaa55721d0eb9be6c5fb678a284a9dd5ad4976413974f/68747470733a2f2f7374617469632e7265717561726b732e696f2f6c6f676f2f77696b696a732d66756c6c2e737667)](https://camo.githubusercontent.com/620ef2ce5831c2e1a03aaa55721d0eb9be6c5fb678a284a9dd5ad4976413974f/68747470733a2f2f7374617469632e7265717561726b732e696f2f6c6f676f2f77696b696a732d66756c6c2e737667) -[![Release](https://camo.githubusercontent.com/5481be23dc6fd3d0ad83ce308f7d2d0b08d139526050c5205e2c8486d4be63cc/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f72656c656173652f5265717561726b732f77696b692e7376673f7374796c653d666c6174266d61784167653d33363030)](https://github.com/Requarks/wiki/releases) [![License](https://camo.githubusercontent.com/f102a36fe39e6e48a6a72568b5fd89126429f4abb44e62d3dc0f40662237acc3/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4147504c76332d626c75652e7376673f7374796c653d666c6174)](https://github.com/requarks/wiki/blob/master/LICENSE) [![Standard - JavaScript Style Guide](https://camo.githubusercontent.com/9627bd217a45aab014d3d5e8e65339b1c0a34e3eeb47a93db448e10c65433904/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f636f64652532307374796c652d7374616e646172642d677265656e2e7376673f7374796c653d666c6174266c6f676f3d6a617661736372697074266c6f676f436f6c6f723d7768697465)](http://standardjs.com/) [![Downloads](https://camo.githubusercontent.com/e8ca75665f619fcfec9967584a8c60b3ef9caabdf004dc7a406422fcf2e9e436/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f646f776e6c6f6164732f5265717561726b732f77696b692f746f74616c2e7376673f7374796c653d666c6174266c6f676f3d676974687562)](https://github.com/Requarks/wiki/releases) [![Docker Pulls](https://camo.githubusercontent.com/93b27a31df00ec78d36fd63ef795b481869ed771b2250ee007fcdb4d837c8723/68747470733a2f2f696d672e736869656c64732e696f2f646f636b65722f70756c6c732f7265717561726b732f77696b692e7376673f6c6f676f3d646f636b6572266c6f676f436f6c6f723d7768697465)](https://hub.docker.com/r/requarks/wiki/) -[![Build + Publish](https://github.com/Requarks/wiki/actions/workflows/build.yml/badge.svg)](https://github.com/Requarks/wiki/actions/workflows/build.yml) [![Huntr](https://camo.githubusercontent.com/de5ef7c06b40749a4b9ae7b3f6d880d3984056c5729b66e82e599a4825531d10/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f7365637572697479253230626f756e74792d646973636c6f73652d627269676874677265656e2e7376673f7374796c653d666c6174266c6f676f3d636163686574266c6f676f436f6c6f723d7768697465)](https://huntr.dev/bounties/disclose) [![GitHub Sponsors](https://camo.githubusercontent.com/0fca984472a2b81cb72bcfa1adc40626ec6f624b48a20306cb58fa70cb491109/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f73706f6e736f72732f6e67706978656c3f6c6f676f3d67697468756226636f6c6f723d656134616161)](https://github.com/users/NGPixel/sponsorship) [![Open Collective backers and sponsors](https://camo.githubusercontent.com/d81a4361f64f3f8b50160ff593e4e4c3c9b2a650c49d8d93186ffc25b40e4812/68747470733a2f2f696d672e736869656c64732e696f2f6f70656e636f6c6c6563746976652f616c6c2f77696b696a733f6c6162656c3d6261636b65727326636f6c6f723d323138626666266c6f676f3d6f70656e636f6c6c656374697665266c6f676f436f6c6f723d7768697465)](https://opencollective.com/wikijs) [![Subscribe to Newsletter](https://camo.githubusercontent.com/6d27fcccc790f9d42793ddf785574005e8cdffa82259b119cced73396a0404f1/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6e6577736c65747465722d7375627363726962652d79656c6c6f772e7376673f7374796c653d666c6174266c6f676f3d6d61696c6368696d70266c6f676f436f6c6f723d7768697465)](https://blog.js.wiki/subscribe) -[![Chat on Slack](https://camo.githubusercontent.com/094b3171b75875af236cfebcdf72cd8fa24e6ffbef3b0507ee150b84e1a5e7f8/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f736c61636b2d7265717561726b732d4343324235452e7376673f7374796c653d666c6174266c6f676f3d736c61636b)](https://wiki.requarks.io/slack) [![Follow on Twitter](https://camo.githubusercontent.com/3b3d1ea5a95d88fd2ac26b3c8a55ce8b1f87777ca0f761ea0598b3cfed3afec1/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f747769747465722d2534307265717561726b732d626c75652e7376673f7374796c653d666c6174266c6f676f3d74776974746572266c6f676f436f6c6f723d7768697465)](https://twitter.com/requarks) [![Follow on Telegram](https://camo.githubusercontent.com/c1c09eb090ea7a7d7129111364602cf27ef540bd30bc13967a55a1472969b47f/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f74656c656772616d2d25343077696b695f5f6a732d626c75652e7376673f7374796c653d666c6174266c6f676f3d74656c656772616d)](https://t.me/wiki_js) [![Chat on Discord](https://camo.githubusercontent.com/c79b3e89259e595d5d0af4495596ca4b1c69551d8d8aa8b4ddbbbf7f479c8682/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f646973636f72642d6a6f696e2d3844393646362e7376673f7374796c653d666c6174266c6f676f3d646973636f7264266c6f676f436f6c6f723d7768697465)](https://discord.gg/rcxt9QS2jd) [![Reddit](https://camo.githubusercontent.com/1f63134c9f43b0c3389ff0f5a5bed8448ccab5cbd71fde52dbd7d28cd913642e/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f7265646469742d2532467225324677696b696a732d6f72616e67653f6c6f676f3d726564646974266c6f676f436f6c6f723d7768697465)](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 -- **[Official Website](https://js.wiki/)** -- **[Documentation](https://docs.requarks.io/)** -- [Requirements](https://docs.requarks.io/install/requirements) -- [Installation](https://docs.requarks.io/install) -- [Demo](https://docs.requarks.io/demo) -- [Changelog](https://github.com/requarks/wiki/releases) -- [Feature Requests](https://feedback.js.wiki/wiki) -- [Chat with us on Slack](https://wiki.requarks.io/slack) -- [Translations](https://docs.requarks.io/dev/translations) _(We need your help!)_ -- [E2E Testing Results](https://dashboard.cypress.io/projects/r7qxah/runs) -- [Special Thanks](https://github.com/requarks/wiki/blob/main/README.md#special-thanks) -- [Contribute](https://github.com/requarks/wiki/blob/main/README.md#contributors) +- **[Official Website](https://js.wiki/)** +- **[Documentation](https://docs.requarks.io/)** +- [Requirements](https://docs.requarks.io/install/requirements) +- [Installation](https://docs.requarks.io/install) +- [Demo](https://docs.requarks.io/demo) +- [Changelog](https://github.com/requarks/wiki/releases) +- [Feature Requests](https://feedback.js.wiki/wiki) +- [Chat with us on Slack](https://wiki.requarks.io/slack) +- [Translations](https://docs.requarks.io/dev/translations) _(We need your help!)_ +- [E2E Testing Results](https://dashboard.cypress.io/projects/r7qxah/runs) +- [Special Thanks](https://github.com/requarks/wiki/blob/main/README.md#special-thanks) +- [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! -## [](https://github.com/requarks/wiki/blob/main/README.md#donate) \ No newline at end of file +## [](https://github.com/requarks/wiki/blob/main/README.md#donate)