update docker-compose.yml, and apply in qnap OK.

This commit is contained in:
yoga 2022-07-06 01:34:47 +08:00
parent 96e766885b
commit b25ae123fe
3 changed files with 29 additions and 16 deletions

View File

@ -6,3 +6,20 @@ GRANT ALL PRIVILEGES ON DATABASE logdata TO keycloak;
CREATE DATABASE wiki; CREATE DATABASE wiki;
GRANT ALL PRIVILEGES ON DATABASE orderdata TO wikijs; 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;

View File

@ -5,7 +5,7 @@ services:
image: jboss/keycloak:16.1.1 image: jboss/keycloak:16.1.1
restart: unless-stopped restart: unless-stopped
ports: ports:
- 38080:8080 - 28080:8080
environment: environment:
KEYCLOAK_USER: kcroot KEYCLOAK_USER: kcroot
KEYCLOAK_PASSWORD: "Hai_1992" KEYCLOAK_PASSWORD: "Hai_1992"
@ -15,7 +15,7 @@ services:
DB_DATABASE: keycloak DB_DATABASE: keycloak
DB_USER: postgres DB_USER: postgres
DB_PASSWORD: kc1992 DB_PASSWORD: kc1992
#volumes: #volumes:
#- /home/ubuntu/.myDockerDir/Keycloak/etc/:/etc/ #- /home/ubuntu/.myDockerDir/Keycloak/etc/:/etc/
depends_on: depends_on:
- postgresql - postgresql
@ -26,19 +26,15 @@ services:
image: postgres:14.3 image: postgres:14.3
restart: unless-stopped restart: unless-stopped
environment: environment:
POSTGRES_DB: postgres POSTGRES_DB: keycloak
POSTGRES_USER: postgres POSTGRES_USER: postgres
POSTGRES_PASSWORD: kc1992 POSTGRES_PASSWORD: kc1992
command: command: [ 'postgres', '-c', 'max_connections=100', '-c', 'shared_buffers=256MB' ]
- 'postgres'
- '-c'
- 'max_connections=100'
- '-c'
- 'shared_buffers=256MB'
volumes: volumes:
- /home/ubuntu/.myDockerDir/Postgresql/data:/var/lib/postgresql/data - /share/DockerDir/Postgres/data:/var/lib/postgresql/data
#- db-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: networks:
- docker_net - docker_net
logging: logging:
@ -54,7 +50,7 @@ services:
DB_TYPE: postgres DB_TYPE: postgres
DB_HOST: postgresql DB_HOST: postgresql
DB_PORT: 5432 DB_PORT: 5432
DB_NAME: wiki DB_NAME: wikijs
DB_USER: wikijs DB_USER: wikijs
DB_PASS: wikiPGsql1992 DB_PASS: wikiPGsql1992
UPGRADE_COMPANION: 1 UPGRADE_COMPANION: 1
@ -67,6 +63,7 @@ services:
wiki-update: wiki-update:
image: requarks/wiki-update-companion image: requarks/wiki-update-companion
restart: unless-stopped
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
depends_on: depends_on:
@ -79,6 +76,5 @@ networks:
docker_net: docker_net:
external: true external: true
volumes: volumes:
db-data: db-data:

View File

@ -5,12 +5,12 @@ metadata:
data: data:
init.sql: |- init.sql: |-
CREATE DATABASE wikijs; CREATE DATABASE wikijs;
CREATE USER wikijs with password 'Wiki1992.920'; CREATE USER wikijs with password 'wikiPGsql1992';
GRANT CONNECT ON DATABASE wikijs to wikijs; GRANT CONNECT ON DATABASE wikijs to wikijs;
GRANT USAGE ON SCHEMA public TO wikijs; GRANT USAGE ON SCHEMA public TO wikijs;
GRANT SELECT,update,INSERT,delete ON ALL TABLES IN 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; ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT ON TABLES TO wikijs;
CREATE DATABASE keycloak; CREATE DATABASE keycloak;
CREATE USER keycloak with password 'Wiki1992.920'; CREATE USER keycloak with password 'Wiki1992.920';
GRANT CONNECT ON DATABASE keycloak to keycloak; GRANT CONNECT ON DATABASE keycloak to keycloak;