From ca18b35fdecdbdc35836ebddab12b72b088bccdb Mon Sep 17 00:00:00 2001 From: rli Date: Mon, 27 Nov 2023 22:24:24 +0800 Subject: [PATCH 1/3] 1105 --- apps/mongodb/.env | 14 +++++++++----- apps/mongodb/docker-compose.yml | 6 +++--- apps/mongodb/variables.json | 9 +-------- apps/moodle/.env | 23 ++++++++++++----------- apps/moodle/docker-compose.yml | 28 +++++++++++++--------------- apps/moodle/variables.json | 9 +-------- apps/n8n/.env | 10 +++++++--- apps/n8n/docker-compose.yml | 4 ++-- apps/n8n/variables.json | 8 -------- apps/neo4j/.env | 16 +++++++++++----- apps/neo4j/docker-compose.yml | 7 +++---- apps/neo4j/variables.json | 9 +-------- apps/netdata/.env | 8 ++++++-- apps/netdata/docker-compose.yml | 6 +++--- apps/netdata/variables.json | 8 -------- 15 files changed, 72 insertions(+), 93 deletions(-) diff --git a/apps/mongodb/.env b/apps/mongodb/.env index 64c1f1c03..596dcdab5 100644 --- a/apps/mongodb/.env +++ b/apps/mongodb/.env @@ -1,11 +1,15 @@ # versions for you 4.4 W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! W9_VERSION=6.0 -W9_NAME=mongodb -W9_USER=root -W9_PASSWORD=$W9_POWER_PASSWO +W9_ID=mongodb +W9_REPO=mongo +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### W9_DB_PORT=27017 +W9_DB_PORT_SET=27017 +W9_URL_REPLACE=false +W9_URL=appname.example.com W9_NETWORK=websoft9 +W9_USER=root W9_COMMAND="--wiredTigerCacheSizeGB 2 --config /etc/mongod.conf" -W9_URL_REPLACE=false -W9_URL=appname.example.com \ No newline at end of file +W9_PASSWORD=$W9_POWER_PASSWO +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/mongodb/docker-compose.yml b/apps/mongodb/docker-compose.yml index 7e8dd1866..9eec4e878 100644 --- a/apps/mongodb/docker-compose.yml +++ b/apps/mongodb/docker-compose.yml @@ -5,11 +5,11 @@ version: '3.8' services: mongo: - image: mongo:${W9_VERSION} + image: ${W9_REPO}:${W9_VERSION} restart: unless-stopped - container_name: ${W9_NAME} + container_name: ${W9_ID} ports: - - ${W9_DB_PORT}:27017 + - ${W9_DB_PORT_SET}:${W9_DB_PORT} env_file: .env environment: MONGO_INITDB_ROOT_USERNAME: ${W9_USER} diff --git a/apps/mongodb/variables.json b/apps/mongodb/variables.json index b8d5034c1..e4f69c64d 100644 --- a/apps/mongodb/variables.json +++ b/apps/mongodb/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "6.0", "latest" ] } diff --git a/apps/moodle/.env b/apps/moodle/.env index 1176979c4..91bac14da 100644 --- a/apps/moodle/.env +++ b/apps/moodle/.env @@ -1,19 +1,20 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! - W9_VERSION=4.2 -W9_USER=admin -W9_PASSWORD=$W9_POWER_PASSWO -W9_HTTP_PORT=9001 -W9_NAME=moodle +W9_ID=moodle +W9_REPO=docker.io/bitnami/moodle + +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=8080 +W9_HTTP_PORT_SET=9001 W9_NETWORK=websoft9 W9_URL_REPLACE=false W9_URL=appname.example.com -W9_DB_MARIADB_VERSION=10.6 -W9_DB_MARIADB_PORT=3306 -W9_DB_MARIADB_USER=moodle -W9_DB_MARIADB_PASSWORD=$W9_POWER_PASSWO -W9_DB_MARIADB_NAME=moodle -W9_DB_MARIADB_HOST=mariadb +W9_USER=admin +W9_PASSWORD=$W9_POWER_PASSWO +W9_DB_EXPOSE="mariadb" +W9_DIST=community +#### --------------------------------------------------------------------------------------- #### + # below envs is from Bitnami Moodle diff --git a/apps/moodle/docker-compose.yml b/apps/moodle/docker-compose.yml index 913d0f6e8..c2a31b7c3 100644 --- a/apps/moodle/docker-compose.yml +++ b/apps/moodle/docker-compose.yml @@ -5,20 +5,20 @@ version: "3.8" services: moodle: - image: docker.io/bitnami/moodle:${W9_VERSION} - container_name: ${W9_NAME} + image: ${W9_REPO}:${W9_VERSION} + container_name: ${W9_ID} restart: unless-stopped environment: - ALLOW_EMPTY_PASSWORD=no - - MOODLE_DATABASE_HOST=${W9_NAME}-db + - MOODLE_DATABASE_HOST=${W9_ID}-mariadb - MOODLE_DATABASE_PORT_NUMBER=3306 - - MOODLE_DATABASE_USER=${W9_DB_MARIADB_USER} - - MOODLE_DATABASE_PASSWORD=${W9_DB_MARIADB_PASSWORD} - - MOODLE_DATABASE_NAME=${W9_DB_MARIADB_NAME} + - MOODLE_DATABASE_USER=${W9_ID} + - MOODLE_DATABASE_PASSWORD=${W9_POWER_PASSWO} + - MOODLE_DATABASE_NAME=${W9_ID} - MOODLE_USERNAME=${W9_USER} - MOODLE_PASSWORD=${W9_PASSWORD} ports: - - "${W9_HTTP_PORT}:8080" + - "${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}" env_file: - .env volumes: @@ -28,19 +28,17 @@ services: - mariadb mariadb: - image: docker.io/bitnami/mariadb:${W9_DB_MARIADB_VERSION} - container_name: ${W9_NAME}-db + image: docker.io/bitnami/mariadb:10.6 + container_name: ${W9_ID}-mariadb restart: unless-stopped environment: - ALLOW_EMPTY_PASSWORD=no - - MARIADB_USER=${W9_DB_MARIADB_USER} - - MARIADB_PASSWORD=${W9_DB_MARIADB_PASSWORD} - - MARIADB_ROOT_PASSWORD=${W9_DB_MARIADB_PASSWORD} - - MARIADB_DATABASE=${W9_DB_MARIADB_NAME} + - MARIADB_USER=${W9_ID} + - MARIADB_PASSWORD=${W9_POWER_PASSWO} + - MARIADB_ROOT_PASSWORD=${W9_POWER_PASSWO} + - MARIADB_DATABASE=${W9_ID} - MARIADB_CHARACTER_SET=utf8mb4 - MARIADB_COLLATE=utf8mb4_unicode_ci - ports: - - ${W9_DB_MARIADB_PORT}:3306 volumes: - "mariadb_data:/bitnami/mariadb" diff --git a/apps/moodle/variables.json b/apps/moodle/variables.json index af660e400..b44af4221 100644 --- a/apps/moodle/variables.json +++ b/apps/moodle/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "4.2", "latest" ] } diff --git a/apps/n8n/.env b/apps/n8n/.env index 4ef817584..2a038b832 100644 --- a/apps/n8n/.env +++ b/apps/n8n/.env @@ -1,11 +1,15 @@ W9_POWER_PASSWO=12rMxExC45LsCT - -W9_NAME=n8n +W9_ID=n8n W9_REPO=docker.n8n.io/n8nio/n8n W9_VERSION=latest # port, W9_PORT is need at leaset -W9_HTTP_PORT=9001 + +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=5678 +W9_HTTP_PORT_SET=9001 W9_NETWORK=websoft9 +#### --------------------------------------------------------------------------------------- #### + N8N_CONFIG_FILES="/home/node/.n8n/my-config.json" \ No newline at end of file diff --git a/apps/n8n/docker-compose.yml b/apps/n8n/docker-compose.yml index c9db0f945..0aee1ea45 100644 --- a/apps/n8n/docker-compose.yml +++ b/apps/n8n/docker-compose.yml @@ -6,12 +6,12 @@ version: '3.8' services: n8n: image: $W9_REPO:$W9_VERSION - container_name: $W9_NAME + container_name: $W9_ID restart: unless-stopped env_file: - .env ports: - - '${W9_HTTP_PORT}:5678' + - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}' volumes: - 'n8n:/home/node/.n8n' - './src/my-config.json:$N8N_CONFIG_FILES' diff --git a/apps/n8n/variables.json b/apps/n8n/variables.json index 1e5f68f1a..4979249b0 100644 --- a/apps/n8n/variables.json +++ b/apps/n8n/variables.json @@ -7,14 +7,6 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", "latest" ] } diff --git a/apps/neo4j/.env b/apps/neo4j/.env index 7b614c2b6..3cb96ba7a 100644 --- a/apps/neo4j/.env +++ b/apps/neo4j/.env @@ -1,11 +1,17 @@ W9_POWER_PASSWO=8dHZPFLFGoPXuC +W9_REPO=neo4j -W9_DB_NEO4J_PORT=7687 +W9_VERSION=5.7 +W9_ID=neo4j + + +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### + +W9_HTTP_PORT=7474 +W9_HTTP_PORT_SET=9001 W9_DB_NEO4J_USER=neo4j W9_DB_NEO4J_PASSWORD=$W9_POWER_PASSWO -W9_VERSION=5.7 -W9_NAME=neo4j -W9_HTTP_PORT=9001 W9_NETWORK=websoft9 W9_URL_REPLACE=false -W9_URL=appname.example.com \ No newline at end of file +W9_URL=appname.example.com +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/neo4j/docker-compose.yml b/apps/neo4j/docker-compose.yml index 67a8201fc..06d1584fe 100644 --- a/apps/neo4j/docker-compose.yml +++ b/apps/neo4j/docker-compose.yml @@ -5,15 +5,14 @@ version: '3.8' services: neo4j: - container_name: ${W9_NAME} - image: neo4j:${W9_VERSION} + container_name: ${W9_ID} + image: $W9_REPO:${W9_VERSION} env_file: .env environment: # SECURE_FILE_PERMISSIONS=yes - NEO4J_AUTH=${W9_DB_NEO4J_USER}/${W9_DB_NEO4J_PASSWORD} ports: - - ${W9_DB_NEO4J_PORT}:7687 - - ${W9_HTTP_PORT}:7474 + - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT} restart: unless-stopped volumes: - neo4j:/var/lib/neo4j diff --git a/apps/neo4j/variables.json b/apps/neo4j/variables.json index 8e07b5a3e..89f041294 100644 --- a/apps/neo4j/variables.json +++ b/apps/neo4j/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "5.7", "latest" ] } diff --git a/apps/netdata/.env b/apps/netdata/.env index 699024f8e..378f3016a 100644 --- a/apps/netdata/.env +++ b/apps/netdata/.env @@ -1,5 +1,9 @@ W9_VERSION=latest -W9_HTTP_PORT=9001 -W9_NAME=netdata +W9_ID=netdata +W9_REPO=netdata/netdata +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=19999 +W9_HTTP_PORT_SET=9001 W9_NETWORK=websoft9 W9_URL=netdata.example.com +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/netdata/docker-compose.yml b/apps/netdata/docker-compose.yml index a25271ba1..92580c4eb 100644 --- a/apps/netdata/docker-compose.yml +++ b/apps/netdata/docker-compose.yml @@ -5,11 +5,11 @@ version: '3.8' services: netdata: - image: netdata/netdata:$W9_VERSION - container_name: $W9_NAME + image: $W9_REPO:$W9_VERSION + container_name: $W9_ID hostname: $W9_URL ports: - - $W9_HTTP_PORT:19999 + - $W9_HTTP_PORT_SET:$W9_HTTP_PORT restart: unless-stopped cap_add: - SYS_PTRACE diff --git a/apps/netdata/variables.json b/apps/netdata/variables.json index 419525499..7fff36723 100644 --- a/apps/netdata/variables.json +++ b/apps/netdata/variables.json @@ -7,14 +7,6 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", "latest" ] } From 550b5b26b842b1d91530b44e842e263c054fe447 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 23:34:20 +0800 Subject: [PATCH 2/3] neo4j --- apps/neo4j/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/neo4j/docker-compose.yml b/apps/neo4j/docker-compose.yml index 06d1584fe..0ee959f19 100644 --- a/apps/neo4j/docker-compose.yml +++ b/apps/neo4j/docker-compose.yml @@ -12,7 +12,7 @@ services: # SECURE_FILE_PERMISSIONS=yes - NEO4J_AUTH=${W9_DB_NEO4J_USER}/${W9_DB_NEO4J_PASSWORD} ports: - - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT} + - '${W9_HTTP_PORT_SET}:${W9_HTTP_PORT}' restart: unless-stopped volumes: - neo4j:/var/lib/neo4j From 15554d0f96141d2b65a82286aa63ad7b53f5fbef Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 23:38:00 +0800 Subject: [PATCH 3/3] netdata --- apps/netdata/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/netdata/docker-compose.yml b/apps/netdata/docker-compose.yml index 92580c4eb..1bd4f1d93 100644 --- a/apps/netdata/docker-compose.yml +++ b/apps/netdata/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: $W9_ID hostname: $W9_URL ports: - - $W9_HTTP_PORT_SET:$W9_HTTP_PORT + - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT' restart: unless-stopped cap_add: - SYS_PTRACE