From b25ae123fe4b306369272318fe498fa69537f6c9 Mon Sep 17 00:00:00 2001
From: yoga <seawin99@163.com>
Date: Wed, 6 Jul 2022 01:34:47 +0800
Subject: [PATCH] update docker-compose.yml, and apply in qnap OK.

---
 DockerHome/Postgresql/create_more.sql | 17 +++++++++++++++++
 DockerHome/docker-compose.yml         | 24 ++++++++++--------------
 k8s/postgres/postgres-init.yml        |  4 ++--
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/DockerHome/Postgresql/create_more.sql b/DockerHome/Postgresql/create_more.sql
index 7cea673..be65a16 100644
--- a/DockerHome/Postgresql/create_more.sql
+++ b/DockerHome/Postgresql/create_more.sql
@@ -6,3 +6,20 @@ GRANT ALL PRIVILEGES ON DATABASE logdata TO keycloak;
 
 CREATE DATABASE wiki;
 GRANT ALL PRIVILEGES ON DATABASE orderdata TO wikijs;
+
+
+-- from postgres-init.yml
+CREATE DATABASE wikijs;
+CREATE USER wikijs with password 'wikiPGsql1992';
+GRANT CONNECT ON DATABASE wikijs to wikijs;
+GRANT USAGE ON SCHEMA public TO wikijs;
+GRANT SELECT,update,INSERT,delete ON ALL TABLES IN SCHEMA public TO wikijs;
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO wikijs;
+
+-- unused, init by docker-compose.yml
+CREATE DATABASE keycloak;
+CREATE USER keycloak with password 'Wiki1992.920';
+GRANT CONNECT ON DATABASE keycloak to keycloak;
+GRANT USAGE ON SCHEMA public TO keycloak;
+GRANT SELECT,update,INSERT,delete ON ALL TABLES IN SCHEMA public TO keycloak;
+ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO keycloak;
\ No newline at end of file
diff --git a/DockerHome/docker-compose.yml b/DockerHome/docker-compose.yml
index 4dfa816..33254c0 100644
--- a/DockerHome/docker-compose.yml
+++ b/DockerHome/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     image: jboss/keycloak:16.1.1
     restart: unless-stopped
     ports:
-      - 38080:8080
+      - 28080:8080
     environment:
       KEYCLOAK_USER: kcroot
       KEYCLOAK_PASSWORD: "Hai_1992"
@@ -15,7 +15,7 @@ services:
       DB_DATABASE: keycloak
       DB_USER: postgres
       DB_PASSWORD: kc1992
-    #volumes:
+      #volumes:
       #- /home/ubuntu/.myDockerDir/Keycloak/etc/:/etc/
     depends_on:
       - postgresql
@@ -26,19 +26,15 @@ services:
     image: postgres:14.3
     restart: unless-stopped
     environment:
-      POSTGRES_DB: postgres
+      POSTGRES_DB: keycloak
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: kc1992
-    command:
-      - 'postgres'
-      - '-c'
-      - 'max_connections=100'
-      - '-c'
-      - 'shared_buffers=256MB'
+    command: [ 'postgres', '-c', 'max_connections=100', '-c', 'shared_buffers=256MB' ]
     volumes:
-      - /home/ubuntu/.myDockerDir/Postgresql/data:/var/lib/postgresql/data
+      - /share/DockerDir/Postgres/data:/var/lib/postgresql/data
       #- db-data:/var/lib/postgresql/data
-      - ./Postgresql/create_more.sql:/docker-entrypoint-initdb.d/create_more.sql
+      # 映射sql文件，是初始化时自动执行文件 以创建多个数据库
+      #- /share/DockerDir/Postgresql/create_more.sql:/docker-entrypoint-initdb.d/create_more.sql
     networks:
       - docker_net
     logging:
@@ -54,7 +50,7 @@ services:
       DB_TYPE: postgres
       DB_HOST: postgresql
       DB_PORT: 5432
-      DB_NAME: wiki
+      DB_NAME: wikijs
       DB_USER: wikijs
       DB_PASS: wikiPGsql1992
       UPGRADE_COMPANION: 1
@@ -67,6 +63,7 @@ services:
 
   wiki-update:
     image: requarks/wiki-update-companion
+    restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     depends_on:
@@ -79,6 +76,5 @@ networks:
   docker_net:
     external: true
 
-
 volumes:
-  db-data:
\ No newline at end of file
+  db-data:
diff --git a/k8s/postgres/postgres-init.yml b/k8s/postgres/postgres-init.yml
index 7611bb2..c15aedd 100644
--- a/k8s/postgres/postgres-init.yml
+++ b/k8s/postgres/postgres-init.yml
@@ -5,12 +5,12 @@ metadata:
 data:
   init.sql: |-
     CREATE DATABASE wikijs;
-    CREATE USER wikijs with password 'Wiki1992.920';
+    CREATE USER wikijs with password 'wikiPGsql1992';
     GRANT CONNECT ON DATABASE wikijs to wikijs;
     GRANT USAGE ON SCHEMA public TO wikijs;
     GRANT SELECT,update,INSERT,delete ON ALL TABLES IN SCHEMA public TO wikijs;
     ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO wikijs;
-    
+
     CREATE DATABASE keycloak;
     CREATE USER keycloak with password 'Wiki1992.920';
     GRANT CONNECT ON DATABASE keycloak to keycloak;