Skip to content

Commit

Permalink
fix metabase
Browse files Browse the repository at this point in the history
  • Loading branch information
chendelin1982 authored Dec 25, 2023
1 parent 5be19f6 commit eba704c
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 63 deletions.
2 changes: 1 addition & 1 deletion apps/matomo/.env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
W9_POWER_PASSWORD=1PrLxExE45LsCT
W9_DIST=community
W9_REPO=matomo
W9_VERSION=4.14
W9_VERSION=latest

#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
W9_ID=matomo
Expand Down
2 changes: 1 addition & 1 deletion apps/matomo/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"edition": [
{
"dist": "community",
"version": ["4","4.15","latest"]
"version": ["5.0","latest"]
}
],
"requirements": {
Expand Down
2 changes: 1 addition & 1 deletion apps/mattermost/.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ W9_ID=mattermost
W9_HTTP_PORT=8065
W9_HTTP_PORT_SET=9001
W9_URL=appname.example.com
W9_URL_REPLACE=true
W9_DB_EXPOSE="postgresql"
W9_DB_VERSION="13"
W9_NETWORK=websoft9
#### --------------------------------------------------------------------------------------- ####

Expand Down
18 changes: 6 additions & 12 deletions apps/mattermost/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# docker-compose: https://github.com/mattermost/mattermost-docker/blob/master/docker-compose.yml
# docs: https://docs.mattermost.com/install/install-docker.html#deploy-mattermost-on-docker-for-production-use
# image: https://hub.docker.com/r/mattermost/mattermost-team-edition

version: '3.8'
Expand All @@ -10,9 +10,6 @@ services:
restart: unless-stopped
security_opt:
- no-new-privileges:true
pids_limit: 200
tmpfs:
- /tmp
ports:
- ${W9_HTTP_PORT_SET}:8065
volumes:
Expand All @@ -28,18 +25,15 @@ services:

postgres:
container_name: $W9_ID-postgresql
image: postgres:13
image: postgres:$W9_DB_VERSION
restart: unless-stopped
env_file: .env
tmpfs:
- /tmp
- /var/run/postgresql
volumes:
- postgres:/var/lib/postgresql/data
environment:
- TZ
- POSTGRES_PASSWORD:$W9_POWER_PASSWORD
- POSTGRES_DB:$W9_ID
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=$W9_POWER_PASSWORD
- POSTGRES_DB=$W9_ID

networks:
default:
Expand All @@ -53,4 +47,4 @@ volumes:
mattermost_plugins:
mattermost_client_plugins:
mattermost_bleve-indexes:
postgres:
postgres:
2 changes: 1 addition & 1 deletion apps/mattermost/variables.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mattermost",
"trademark": "Mattermost",
"release": false,
"release": true,
"fork_url": "https://github.com/mattermost/docker",
"edition": [
{
Expand Down
3 changes: 1 addition & 2 deletions apps/mediawiki/.env
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ W9_LOGIN_USER=admin
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
W9_DB_EXPOSE="mysql"
W9_DB_VERSION="5.7"
# Must use add port
W9_URL=Inernet_IP:$W9_HTTP_PORT_SET
W9_URL=""
W9_URL_REPLACE=true
W9_NETWORK=websoft9
#### ----------------------------------------------------------------------------------------- ####
Expand Down
4 changes: 4 additions & 0 deletions apps/mediawiki/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ services:
- mediawiki
command: |
/bin/sh -c "
if [ -z \"$W9_URL\" ]; then
echo 'W9_URL is empty, not need to change, exiting...'
exit 0
fi
while [ ! -f /data/LocalSettings.php ]; do
echo 'Waiting for LocalSettings.php to be created...'
sleep 2
Expand Down
12 changes: 5 additions & 7 deletions apps/memcached/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ W9_DIST=community

#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
W9_ID=memcached
W9_MEM_PORT=11211
W9_MEM_PORT_SET=1234
W9_PANEL_PORT=80
W9_PANEL_PORT_SET=9090
W9_MEMORY=2048
W9_URL=appname.example.com
W9_DB_PORT_SET=9098
W9_NETWORK=websoft9
#### --------------------------------------------------------------------------------------- ####
#### --------------------------------------------------------------------------------------- ####

MAX_MEMORY=2048
MAX_CONNECTIONS=1024
15 changes: 3 additions & 12 deletions apps/memcached/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,12 @@ services:
container_name: ${W9_ID}
restart: unless-stopped
ports:
- '${W9_MEM_PORT_SET}:${W9_MEM_PORT}'
- '${W9_DB_PORT_SET}:11211'
env_file: .env
command:
- '-m ${W9_MEMORY}'
- '-c ${W9_MEMORY}'
- '-m ${MAX_MEMORY}'
- '-c ${MAX_CONNECTIONS}'

memadmin:
image: hatamiarash7/memcached-admin:latest
container_name: $W9_ID-panel
restart: unless-stopped
ports:
- '$W9_PANEL_PORT_SET:$W9_PANEL_PORT'
environment:
- 'MEMCACHED_HOST=memcached'
env_file: .env

networks:
default:
Expand Down
2 changes: 1 addition & 1 deletion apps/memcached/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"edition": [
{
"dist": "community",
"version": ["latest"]
"version": ["1.6","latest"]
}
],
"requirements": {
Expand Down
18 changes: 13 additions & 5 deletions apps/metabase/.env
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
W9_POWER_PASSWORD=tfhdjX1vHiwGAi
W9_REPO=metabase/metabase
W9_VERSION=latest
W9_POWER_PASSWORD=tfhdjX1vHiwGAi

#### -- Not allowed to edit below environments when recreate app based on existing data -- ####
W9_ID=metabase
W9_HTTP_PORT_SET=9001
W9_HTTP_PORT=3000
W9_TIMEZONE=Asia/Shanghai
W9_URL=appname.example.com
W9_DB_EXPOSE="mysql"

W9_LOGIN_USER=[email protected]
W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD

W9_DB_EXPOSE="postgresql"
W9_DB_VERSION="13"

W9_NETWORK=websoft9
#### --------------------------------------------------------------------------------------- ####

MB_DB_TYPE=mysql
MB_DB_FILE="/metabase-data/metabase.db"
MB_DB_TYPE=postgres
MB_DB_DBNAME=$W9_ID
MB_DB_PORT=5432
MB_DB_USER=postgres
MB_DB_PASS=$W9_POWER_PASSWORD
MB_DB_HOST=$W9_ID-postgresql
JAVA_TIMEZONE=US/Pacific
28 changes: 9 additions & 19 deletions apps/metabase/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,27 @@ services:
container_name: $W9_ID
hostname: $W9_ID
volumes:
- /dev/urandom:/dev/random:ro
- metabase-data:/metabase-data
- metabase-plugins:/plugins
ports:
- '$W9_HTTP_PORT_SET:$W9_HTTP_PORT'
privileged: true
env_file: .env
environment:
JAVA_TIMEZONE: $W9_TIMEZONE
MB_DB_DBNAME: $W9_ID
MB_DB_USER: root
MB_DB_PASS: $W9_POWER_PASSWORD
MB_DB_HOST: $W9_ID-mysql
depends_on:
- mysql
- postgres

mysql:
image: mysql:5.7
container_name: $W9_ID-mysql
postgres:
container_name: $W9_ID-postgresql
image: postgres:$W9_DB_VERSION
restart: unless-stopped
volumes:
- mysql:/var/lib/mysql
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-time-zone=+8:00 --lower-case-table-names=1 --default-authentication-plugin=mysql_native_password
- postgres:/var/lib/postgresql/data
environment:
MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
MYSQL_DATABASE: $W9_ID
MYSQL_USERNAME: root
MYSQL_PASSWORD: $W9_POWER_PASSWORD
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=$W9_POWER_PASSWORD
- POSTGRES_DB=$W9_ID

volumes:
mysql:
postgres:
metabase-data:
metabase-plugins:

Expand Down
2 changes: 1 addition & 1 deletion apps/metabase/variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"edition": [
{
"dist": "community",
"version": ["0.47.3","latest"]
"version": ["0.47.9","latest"]
}
],
"requirements": {
Expand Down

0 comments on commit eba704c

Please sign in to comment.