UPDATE: added xwiki query to init/ updated .yml (works)

This commit is contained in:
Key 2024-01-07 00:06:51 -05:00
parent 0516cdd377
commit 5d3dc08b47
2 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,7 @@
CREATE USER IF NOT EXISTS 'wiki_user'@'%' IDENTIFIED BY 'wiki_password';
CREATE USER IF NOT EXISTS 'xwiki'@'%' IDENTIFIED BY 'wiki_password';
CREATE DATABASE IF NOT EXISTS 'mediawiki' CHARACTER SET utf8;
CREATE DATABASE IF NOT EXISTS 'xwiki' CHARACTER SET utf8;
GRANT ALL PRIVILEGES ON *.* TO 'wiki_user'@'%' IDENTIFIED BY 'wiki_password';
GRANT ALL PRIVILEGES ON *.* TO 'wiki_user'@localhost IDENTIFIED BY 'wiki_password';
GRANT ALL PRIVILEGES ON *.* to 'xwiki'@'%';

View File

@ -27,7 +27,7 @@ services:
# After initial setup, download LocalSettings.php to the same directory as
# this yaml and uncomment the following line and use compose to restart
# the mediawiki service
xwiki:
xwiki:
image: xwiki:stable-mariadb-tomcat
container_name: xwiki
hostname: xwiki
@ -38,14 +38,15 @@ xwiki:
DB_USER: root
DB_PASSWORD: mariadb_secret
DB_HOST: database
DB_DATABASE: xwiki
networks:
- docker_network
ports:
- 8081:8080
volumes:
- ./xwiki-data:/usr/local/xwiki
- ./xwiki-data-new:/usr/local/xwiki
database:
database:
image: mariadb
container_name: database
hostname: database
@ -55,7 +56,7 @@ database:
networks:
- docker_network
environment:
MYSQL_DATABASE: my_wiki
MYSQL_DATABASE: xwiki
MYSQL_USER: wiki_user
MYSQL_PASSWORD: wiki_password
MYSQL_ROOT_PASSWORD: mariadb_secret