diff --git a/apps/matomo/.env b/apps/matomo/.env index fbd59842a..655d04c1a 100644 --- a/apps/matomo/.env +++ b/apps/matomo/.env @@ -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 diff --git a/apps/matomo/variables.json b/apps/matomo/variables.json index af36fe8ea..617774f78 100644 --- a/apps/matomo/variables.json +++ b/apps/matomo/variables.json @@ -6,7 +6,7 @@ "edition": [ { "dist": "community", - "version": ["4","4.15","latest"] + "version": ["5.0","latest"] } ], "requirements": { diff --git a/apps/mattermost/.env b/apps/mattermost/.env index 1f861dca0..87f36713f 100644 --- a/apps/mattermost/.env +++ b/apps/mattermost/.env @@ -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 #### --------------------------------------------------------------------------------------- #### diff --git a/apps/mattermost/docker-compose.yml b/apps/mattermost/docker-compose.yml index 8a4f8167e..0a1937e94 100644 --- a/apps/mattermost/docker-compose.yml +++ b/apps/mattermost/docker-compose.yml @@ -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' @@ -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: @@ -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: @@ -53,4 +47,4 @@ volumes: mattermost_plugins: mattermost_client_plugins: mattermost_bleve-indexes: - postgres: + postgres: \ No newline at end of file diff --git a/apps/mattermost/variables.json b/apps/mattermost/variables.json index 3c28a69ed..ec75e10be 100644 --- a/apps/mattermost/variables.json +++ b/apps/mattermost/variables.json @@ -1,7 +1,7 @@ { "name": "mattermost", "trademark": "Mattermost", - "release": false, + "release": true, "fork_url": "https://github.com/mattermost/docker", "edition": [ { diff --git a/apps/mediawiki/.env b/apps/mediawiki/.env index 65d904851..de57b6d04 100644 --- a/apps/mediawiki/.env +++ b/apps/mediawiki/.env @@ -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 #### ----------------------------------------------------------------------------------------- #### diff --git a/apps/mediawiki/docker-compose.yml b/apps/mediawiki/docker-compose.yml index 4133ee308..22dbd10e0 100644 --- a/apps/mediawiki/docker-compose.yml +++ b/apps/mediawiki/docker-compose.yml @@ -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 diff --git a/apps/memcached/.env b/apps/memcached/.env index e655e40da..bc57330cd 100644 --- a/apps/memcached/.env +++ b/apps/memcached/.env @@ -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 -#### --------------------------------------------------------------------------------------- #### \ No newline at end of file +#### --------------------------------------------------------------------------------------- #### + +MAX_MEMORY=2048 +MAX_CONNECTIONS=1024 \ No newline at end of file diff --git a/apps/memcached/docker-compose.yml b/apps/memcached/docker-compose.yml index 887793951..3ef5a5d68 100644 --- a/apps/memcached/docker-compose.yml +++ b/apps/memcached/docker-compose.yml @@ -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: diff --git a/apps/memcached/variables.json b/apps/memcached/variables.json index d40cea0c8..3b8b0b928 100644 --- a/apps/memcached/variables.json +++ b/apps/memcached/variables.json @@ -6,7 +6,7 @@ "edition": [ { "dist": "community", - "version": ["latest"] + "version": ["1.6","latest"] } ], "requirements": { diff --git a/apps/metabase/.env b/apps/metabase/.env index 6c9efeb90..ed86fe452 100644 --- a/apps/metabase/.env +++ b/apps/metabase/.env @@ -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=admin@metabase.local 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 \ No newline at end of file diff --git a/apps/metabase/docker-compose.yml b/apps/metabase/docker-compose.yml index e290e69b8..326a74cc3 100644 --- a/apps/metabase/docker-compose.yml +++ b/apps/metabase/docker-compose.yml @@ -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: diff --git a/apps/metabase/variables.json b/apps/metabase/variables.json index 185aaa241..3ed819edc 100644 --- a/apps/metabase/variables.json +++ b/apps/metabase/variables.json @@ -6,7 +6,7 @@ "edition": [ { "dist": "community", - "version": ["0.47.3","latest"] + "version": ["0.47.9","latest"] } ], "requirements": {