From 238a321c27e679f0c0e66997722a8a1df4f6d2dc Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 10:02:32 +0800 Subject: [PATCH 1/9] 1405 --- apps/oracle/.env | 18 +++++++++--------- apps/oracle/docker-compose.yml | 14 +++++++------- apps/oracle/variables.json | 8 -------- apps/plausible/.env | 16 +++++++++------- apps/plausible/docker-compose.yml | 12 +++++++----- apps/plausible/variables.json | 9 +-------- apps/postgresql/.env | 16 +++++++++------- apps/postgresql/docker-compose.yml | 10 +++++----- apps/postgresql/variables.json | 9 +-------- apps/prestashop/.env | 20 +++++++++++--------- apps/prestashop/docker-compose.yml | 28 +++++++++++++--------------- apps/prestashop/variables.json | 9 +-------- apps/pydio/.env | 22 ++++++++++++---------- apps/pydio/docker-compose.yml | 22 ++++++++++------------ apps/pydio/variables.json | 8 -------- 15 files changed, 95 insertions(+), 126 deletions(-) diff --git a/apps/oracle/.env b/apps/oracle/.env index 578b947e7..6a67d6b37 100644 --- a/apps/oracle/.env +++ b/apps/oracle/.env @@ -4,15 +4,21 @@ # when express edtion, version includes [latest,21.3.0-xe,18.4.0-xe] W9_POWER_PASSWO=X14eTpm7LjDGZT W9_VERSION=latest -W9_NAME=oracle -W9_NETWORK=websoft9 +W9_ID=oracle W9_USER=sys + +W9_REPO=container-registry.oracle.com/database/enterprise +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### W9_EM_PORT=5500 +W9_EM_PORT_SET=5500 W9_DB_PORT=1521 +W9_DB_PORT_SET=1521 + W9_COMPOSE_UP=true -W9_DB_ORACLE_PASSWORD=$W9_POWER_PASSWO W9_URL_REPLACE=false W9_URL=appname.example.com +#### --------------------------------------------------------------------------------------- #### + # envrionments for express and enterprise ORACLE_CHARACTERSET=AL32UTF8 ORACLE_PWD=$W9_POWER_PASSWO @@ -22,15 +28,9 @@ ORACLE_SID=ORCLCDB ORACLE_PDB=ORCLPDB1 ORACLE_EDITION=enterprise ENABLE_ARCHIVELOG=false - -# optional environment -# INIT_SGA_SIZE=1000 -# INIT_PGA_SIZE=5000 - # Below environments only for express references, can not be used for image ORACLE_EX_SID=XE ORACLE_EX_PDB=XEPDB1 - diff --git a/apps/oracle/docker-compose.yml b/apps/oracle/docker-compose.yml index e93ae42ce..70c9cbf30 100644 --- a/apps/oracle/docker-compose.yml +++ b/apps/oracle/docker-compose.yml @@ -6,30 +6,30 @@ version: '3.8' services: oracleex: image: container-registry.oracle.com/database/express:${W9_VERSION} - container_name: ${W9_NAME} + container_name: ${W9_ID} env_file: .env volumes: - data:/opt/oracle/oradata - startup:/opt/oracle/scripts/startup - setup:/opt/oracle/scripts/setup ports: - - ${W9_DB_PORT}:1521 - - ${W9_EM_PORT}:5500 + - ${W9_DB_PORT_SET}:${W9_DB_PORT} + - ${W9_EM_PORT_SET}:${W9_EM_PORT} restart: unless-stopped profiles: - express oracle: - image: container-registry.oracle.com/database/enterprise:${W9_VERSION} - container_name: ${W9_NAME} + image: ${W9_REPO}:${W9_VERSION} + container_name: ${W9_ID} env_file: .env volumes: - data:/opt/oracle/oradata - startup:/opt/oracle/scripts/startup - setup:/opt/oracle/scripts/setup ports: - - ${W9_DB_PORT}:1521 - - ${W9_EM_PORT}:5500 + - ${W9_DB_PORT_SET}:${W9_DB_PORT} + - ${W9_EM_PORT_SET}:${W9_EM_PORT} restart: unless-stopped profiles: - enterprise diff --git a/apps/oracle/variables.json b/apps/oracle/variables.json index db09d3e69..85a03f678 100644 --- a/apps/oracle/variables.json +++ b/apps/oracle/variables.json @@ -7,14 +7,6 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", "latest" ] } diff --git a/apps/plausible/.env b/apps/plausible/.env index 3b5dd121a..a1f9ff97f 100644 --- a/apps/plausible/.env +++ b/apps/plausible/.env @@ -1,16 +1,18 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! -W9_NAME=plausible +W9_ID=plausible W9_REPO=plausible/analytics W9_VERSION=v1.5 -W9_URL=appname.example.com -W9_HTTP_PORT=9001 -W9_NETWORK=websoft9 +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=8000 +W9_HTTP_PORT_SET=9001 -W9_DB_POSTGRES_PASSWORD=$W9_PASSWORD -W9_DB_POSTGRES_NAME=$W9_NAME -W9_DB_POSTGRES_USER=$W9_NAME +W9_NETWORK=websoft9 +W9_URL=appname.example.com +W9_DIST=community +W9_DB_EXPOSE="postgresql" +#### --------------------------------------------------------------------------------------- #### # from: https://github.com/plausible/hosting/blob/master/plausible-conf.env BASE_URL=http://$W9_URL diff --git a/apps/plausible/docker-compose.yml b/apps/plausible/docker-compose.yml index 49eedc095..cebaa3c0b 100644 --- a/apps/plausible/docker-compose.yml +++ b/apps/plausible/docker-compose.yml @@ -8,7 +8,7 @@ services: plausible: image: $W9_REPO:$W9_VERSION - container_name: $W9_NAME + container_name: $W9_ID restart: unless-stopped command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run" depends_on: @@ -16,19 +16,19 @@ services: - plausible_events_db - mail ports: - - $W9_HTTP_PORT:8000 + - $W9_HTTP_PORT_SET:$W9_HTTP_PORT env_file: - .env mail: image: bytemark/smtp - container_name: $W9_NAME-mail + container_name: $W9_ID-mail restart: unless-stopped plausible_db: # supported versions are 12, 13, and 14 image: postgres:14-alpine - container_name: $W9_NAME-db + container_name: $W9_ID-postgresql restart: unless-stopped volumes: - db-data:/var/lib/postgresql/data @@ -37,7 +37,7 @@ services: plausible_events_db: image: clickhouse/clickhouse-server:22.6-alpine - container_name: $W9_NAME-clickhouse + container_name: $W9_ID-clickhouse restart: unless-stopped volumes: - event-data:/var/lib/clickhouse @@ -47,6 +47,8 @@ services: nofile: soft: 262144 hard: 262144 + env_file: + - .env networks: default: diff --git a/apps/plausible/variables.json b/apps/plausible/variables.json index fc7368f75..0b937e939 100644 --- a/apps/plausible/variables.json +++ b/apps/plausible/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "v1.5", "latest" ] } diff --git a/apps/postgresql/.env b/apps/postgresql/.env index 355cc7ee2..919f6693a 100644 --- a/apps/postgresql/.env +++ b/apps/postgresql/.env @@ -1,11 +1,13 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! W9_VERSION=15 -W9_NAME=postgres -W9_DB_POSTGRES_PORT=5432 -W9_DB_POSTGRES_NAME=$W9_NAME -W9_DB_POSTGRES_USER=postgres -W9_DB_POSTGRES_HOST=postgres -W9_DB_POSTGRES_PASSWORD=$W9_POWER_PASSWO +W9_ID=postgres +W9_REPO=postgres +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_DB_POSTGRES_PORT=1234 +W9_DB_POSTGRES_PORT_SET=1234 + W9_NETWORK=websoft9 W9_URL_REPLACE=false -W9_URL=appname.example.com \ No newline at end of file +W9_URL=appname.example.com +W9_DIST=community +#### --------------------------------------------------------------------------------------- #### \ No newline at end of file diff --git a/apps/postgresql/docker-compose.yml b/apps/postgresql/docker-compose.yml index 04f81f45d..5d5d382b9 100644 --- a/apps/postgresql/docker-compose.yml +++ b/apps/postgresql/docker-compose.yml @@ -3,18 +3,18 @@ version: '3.8' services: postgres: - image: postgres:${W9_VERSION} - container_name: ${W9_NAME} + image: ${W9_REPO}:${W9_VERSION} + container_name: ${W9_ID} restart: unless-stopped ports: - - ${W9_DB_POSTGRES_PORT}:5432 + - ${W9_DB_POSTGRES_PORT_SET}:${W9_DB_POSTGRES_PORT} volumes: - postgres:/var/lib/postgresql/data env_file: .env environment: POSTGRES_DB: ${W9_DB_POSTGRES_NAME} - POSTGRES_USER: ${W9_DB_POSTGRES_USER} - POSTGRES_PASSWORD: ${W9_DB_POSTGRES_PASSWORD} + POSTGRES_USER: ${W9_ID} + POSTGRES_PASSWORD: ${W9_POWER_PASSWO} volumes: postgres: diff --git a/apps/postgresql/variables.json b/apps/postgresql/variables.json index 86dbe1a72..a619f95ee 100644 --- a/apps/postgresql/variables.json +++ b/apps/postgresql/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "15", "latest" ] } diff --git a/apps/prestashop/.env b/apps/prestashop/.env index d6d398173..f21d6cc76 100644 --- a/apps/prestashop/.env +++ b/apps/prestashop/.env @@ -1,20 +1,22 @@ W9_POWER_PASSWO=uQ8E1wVTzG8SOk3! -W9_DB_MYSQL_VERSION=5.7 -W9_DB_MYSQL_PORT=3306 -W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO -W9_DB_MYSQL_NAME=prestashop -W9_DB_MYSQL_USER=prestashop -W9_NETWORK=websoft9 W9_VERSION=8 -W9_HTTP_PORT=9001 +W9_ID=prestashop +W9_REPO=prestashop/prestashop +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=80 +W9_HTTP_PORT_SET=9001 + W9_USER=help@websoft9.com -W9_PASSWORD=$W9_POWER_PASSWO -W9_NAME=prestashop +W9_NETWORK=websoft9 W9_URL_REPLACE=true W9_URL=appname.example.com:$W9_HTTP_PORT +W9_DIST=community +W9_DB_EXPOSE="mysql" +#### --------------------------------------------------------------------------------------- #### PS_DEMO_MODE=0 PS_INSTALL_AUTO=1 PS_HANDLE_DYNAMIC_DOMAIN=0 PS_COUNTRY=GB PS_LANGUAGE=en + diff --git a/apps/prestashop/docker-compose.yml b/apps/prestashop/docker-compose.yml index d18df92af..db2fdc005 100644 --- a/apps/prestashop/docker-compose.yml +++ b/apps/prestashop/docker-compose.yml @@ -5,39 +5,37 @@ version: '3.8' services: prestashop: - image: prestashop/prestashop:${W9_VERSION} - container_name: ${W9_NAME} + image: ${W9_REPO}:${W9_VERSION} + container_name: ${W9_ID} ports: - - ${W9_HTTP_PORT}:80 + - ${W9_HTTP_PORT_SET}:${W9_HTTP_PORT} volumes: - prestashop:/var/www/html env_file: .env environment: - PS_DOMAIN=${W9_URL} - - DB_SERVER=${W9_NAME}-db - - DB_USER=${W9_DB_MYSQL_USER} - - DB_PASSWD=${W9_DB_MYSQL_PASSWORD} + - DB_SERVER=${W9_ID}-mysql + - DB_USER=${W9_ID} + - DB_PASSWD=${W9_POWER_PASSWO} - DB_PREFIX=ps_ - ADMIN_MAIL=${W9_USER} - - ADMIN_PASSWD=${W9_PASSWORD} + - ADMIN_PASSWD=${W9_POWER_PASSWO} depends_on: - mysql restart: unless-stopped mysql: - image: mysql:${W9_DB_MYSQL_VERSION} - container_name: ${W9_NAME}-db + image: mysql:5.7 + container_name: ${W9_ID}-mysql restart: unless-stopped - ports: - - ${W9_DB_MYSQL_PORT}:3306 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci volumes: - mysql_data:/var/lib/mysql environment: - MYSQL_DATABASE: ${W9_DB_MYSQL_NAME} - MYSQL_USER: ${W9_DB_MYSQL_USER} - MYSQL_PASSWORD: ${W9_DB_MYSQL_PASSWORD} - MYSQL_ROOT_PASSWORD: ${W9_DB_MYSQL_PASSWORD} + MYSQL_DATABASE: ${W9_ID} + MYSQL_USER: ${W9_ID} + MYSQL_PASSWORD: ${W9_POWER_PASSWO} + MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWO} networks: default: diff --git a/apps/prestashop/variables.json b/apps/prestashop/variables.json index 3e688554a..0a887ce6d 100644 --- a/apps/prestashop/variables.json +++ b/apps/prestashop/variables.json @@ -7,14 +7,7 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", + "8", "latest" ] } diff --git a/apps/pydio/.env b/apps/pydio/.env index 3cf42f7ec..18ec09b55 100644 --- a/apps/pydio/.env +++ b/apps/pydio/.env @@ -1,20 +1,22 @@ W9_POWER_PASSWO=spJNF09yzwWJaG! -W9_NETWORK=websoft9 -W9_NAME=pydio +W9_ID=pydio W9_VERSION=latest -W9_HTTP_PORT=9001 +W9_USER=admin +W9_REPO=pydio/cells +#### -- Not allowed to edit below environments when recreate app based on existing data -- #### +W9_HTTP_PORT=8080 W9_GRPC_PORT=33060 +W9_HTTP_PORT_SET=9001 +W9_GRPC_PORT_SET=33060 -W9_USER=admin -W9_PASSWORD=$W9_POWER_PASSWO +W9_NETWORK=websoft9 W9_URL_REPLACE=false W9_URL=appname.example.com -W9_DB_MYSQL_VERSION=8 -W9_DB_MYSQL_PORT=3306 -W9_DB_MYSQL_PASSWORD=$W9_POWER_PASSWO -W9_DB_MYSQL_NAME=$W9_NAME -W9_DB_MYSQL_USER=$W9_NAME +W9_DIST=community +W9_DB_EXPOSE="mysql" +#### --------------------------------------------------------------------------------------- #### + # CELLS_SITE_EXTERNAL must set, otherwise it login failed CELLS_LOG_LEVEL=info diff --git a/apps/pydio/docker-compose.yml b/apps/pydio/docker-compose.yml index 9463686cf..75efd8ff1 100644 --- a/apps/pydio/docker-compose.yml +++ b/apps/pydio/docker-compose.yml @@ -5,11 +5,11 @@ version: '3.8' services: pydio: - image: pydio/cells:$W9_VERSION - container_name: $W9_NAME + image: $W9_REPO:$W9_VERSION + container_name: $W9_ID ports: - - $W9_HTTP_PORT:8080 - - $W9_GRPC_PORT:33060 + - $W9_HTTP_PORT_SET:$W9_HTTP_PORT + - $W9_GRPC_PORT_SET:$W9_GRPC_PORT volumes: - pydio:/var/cells - ./src/install-conf.yml:/pydio/config/install.yml:ro @@ -18,19 +18,17 @@ services: restart: unless-stopped mysql: - image: mysql:$W9_DB_MYSQL_VERSION - container_name: $W9_NAME-db + image: mysql:8 + container_name: $W9_ID-mysql restart: unless-stopped command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci] - ports: - - $W9_DB_MYSQL_PORT:3306 volumes: - mysql:/var/lib/mysql environment: - MYSQL_DATABASE: $W9_DB_MYSQL_NAME - MYSQL_USER: $W9_DB_MYSQL_USER - MYSQL_PASSWORD: $W9_DB_MYSQL_PASSWORD - MYSQL_ROOT_PASSWORD: $W9_DB_MYSQL_PASSWORD + MYSQL_DATABASE: $W9_ID + MYSQL_USER: $W9_ID + MYSQL_PASSWORD: $W9_POWER_PASSWO + MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWO networks: default: diff --git a/apps/pydio/variables.json b/apps/pydio/variables.json index 101ba99a7..641c11ad0 100644 --- a/apps/pydio/variables.json +++ b/apps/pydio/variables.json @@ -7,14 +7,6 @@ { "dist": "community", "version": [ - "2.2", - "latest" - ] - }, - { - "dist": "enterprise", - "version": [ - "1.8.2", "latest" ] } From c74103dbfb68b565b74788750203cb434c21de63 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 21:42:59 +0800 Subject: [PATCH 2/9] oracle --- apps/oracle/.env | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/oracle/.env b/apps/oracle/.env index 6a67d6b37..82b9a49cc 100644 --- a/apps/oracle/.env +++ b/apps/oracle/.env @@ -14,6 +14,7 @@ W9_EM_PORT_SET=5500 W9_DB_PORT=1521 W9_DB_PORT_SET=1521 +W9_NETWORK=websoft9 W9_COMPOSE_UP=true W9_URL_REPLACE=false W9_URL=appname.example.com From b10446b8b5cd99ccf6be71a81ce686f29fafacbe Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 21:51:42 +0800 Subject: [PATCH 3/9] plausible --- apps/plausible/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/plausible/docker-compose.yml b/apps/plausible/docker-compose.yml index cebaa3c0b..42ac44f01 100644 --- a/apps/plausible/docker-compose.yml +++ b/apps/plausible/docker-compose.yml @@ -33,7 +33,7 @@ services: volumes: - db-data:/var/lib/postgresql/data environment: - - POSTGRES_PASSWORD=$W9_DB_POSTGRES_PASSWOR + - POSTGRES_PASSWORD=$W9_PASSWORD plausible_events_db: image: clickhouse/clickhouse-server:22.6-alpine From 0a3f3be2702be0b343d6342ca12a2c5fd9ce58b9 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 21:53:42 +0800 Subject: [PATCH 4/9] plausible --- apps/plausible/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/plausible/docker-compose.yml b/apps/plausible/docker-compose.yml index 42ac44f01..d19ced743 100644 --- a/apps/plausible/docker-compose.yml +++ b/apps/plausible/docker-compose.yml @@ -33,7 +33,7 @@ services: volumes: - db-data:/var/lib/postgresql/data environment: - - POSTGRES_PASSWORD=$W9_PASSWORD + - POSTGRES_PASSWORD=$W9_POWER_PASSWO plausible_events_db: image: clickhouse/clickhouse-server:22.6-alpine From b8a79f9df3f9505c644a7d777006f5f1d68a9eb0 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 22:01:15 +0800 Subject: [PATCH 5/9] postgresql --- apps/postgresql/.env | 4 ++-- apps/postgresql/docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/postgresql/.env b/apps/postgresql/.env index 919f6693a..aee7e7e54 100644 --- a/apps/postgresql/.env +++ b/apps/postgresql/.env @@ -3,8 +3,8 @@ W9_VERSION=15 W9_ID=postgres W9_REPO=postgres #### -- Not allowed to edit below environments when recreate app based on existing data -- #### -W9_DB_POSTGRES_PORT=1234 -W9_DB_POSTGRES_PORT_SET=1234 +W9_DB_POSTGRES_PORT=5432 +W9_DB_POSTGRES_PORT_SET=5432 W9_NETWORK=websoft9 W9_URL_REPLACE=false diff --git a/apps/postgresql/docker-compose.yml b/apps/postgresql/docker-compose.yml index 5d5d382b9..b88f612f6 100644 --- a/apps/postgresql/docker-compose.yml +++ b/apps/postgresql/docker-compose.yml @@ -7,7 +7,7 @@ services: container_name: ${W9_ID} restart: unless-stopped ports: - - ${W9_DB_POSTGRES_PORT_SET}:${W9_DB_POSTGRES_PORT} + - '${W9_DB_POSTGRES_PORT_SET}:${W9_DB_POSTGRES_PORT}' volumes: - postgres:/var/lib/postgresql/data env_file: .env From 32758d7c3b6f166c5c85bdc2e3d0858856db79ba Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 22:02:18 +0800 Subject: [PATCH 6/9] postgresql --- apps/postgresql/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/postgresql/docker-compose.yml b/apps/postgresql/docker-compose.yml index b88f612f6..e18f5ae64 100644 --- a/apps/postgresql/docker-compose.yml +++ b/apps/postgresql/docker-compose.yml @@ -12,7 +12,7 @@ services: - postgres:/var/lib/postgresql/data env_file: .env environment: - POSTGRES_DB: ${W9_DB_POSTGRES_NAME} + POSTGRES_DB: ${W9_ID} POSTGRES_USER: ${W9_ID} POSTGRES_PASSWORD: ${W9_POWER_PASSWO} From e60be172c42236397b73f70d54bcaa705c490ad7 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 22:04:36 +0800 Subject: [PATCH 7/9] prestashop --- apps/prestashop/docker-compose.yml | 1 + apps/pydio/docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/prestashop/docker-compose.yml b/apps/prestashop/docker-compose.yml index db2fdc005..563152f20 100644 --- a/apps/prestashop/docker-compose.yml +++ b/apps/prestashop/docker-compose.yml @@ -36,6 +36,7 @@ services: MYSQL_USER: ${W9_ID} MYSQL_PASSWORD: ${W9_POWER_PASSWO} MYSQL_ROOT_PASSWORD: ${W9_POWER_PASSWO} + env_file: .env networks: default: diff --git a/apps/pydio/docker-compose.yml b/apps/pydio/docker-compose.yml index 75efd8ff1..4b2466fcd 100644 --- a/apps/pydio/docker-compose.yml +++ b/apps/pydio/docker-compose.yml @@ -29,6 +29,7 @@ services: MYSQL_USER: $W9_ID MYSQL_PASSWORD: $W9_POWER_PASSWO MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWO + env_file: .env networks: default: From 556f2e2ec28cb6a1d409fe39a5b7fe8b85d9c74d Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 22:12:56 +0800 Subject: [PATCH 8/9] prestashop --- apps/prestashop/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/prestashop/.env b/apps/prestashop/.env index f21d6cc76..9be7d2f0e 100644 --- a/apps/prestashop/.env +++ b/apps/prestashop/.env @@ -9,7 +9,7 @@ W9_HTTP_PORT_SET=9001 W9_USER=help@websoft9.com W9_NETWORK=websoft9 W9_URL_REPLACE=true -W9_URL=appname.example.com:$W9_HTTP_PORT +W9_URL=appname.example.com:$W9_HTTP_PORT_SET W9_DIST=community W9_DB_EXPOSE="mysql" #### --------------------------------------------------------------------------------------- #### From 9c6d1c2af1e3785dcc77fab7348d190f384caf75 Mon Sep 17 00:00:00 2001 From: rli Date: Tue, 28 Nov 2023 22:16:42 +0800 Subject: [PATCH 9/9] pydio --- apps/pydio/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/pydio/docker-compose.yml b/apps/pydio/docker-compose.yml index 4b2466fcd..2de47eac0 100644 --- a/apps/pydio/docker-compose.yml +++ b/apps/pydio/docker-compose.yml @@ -8,8 +8,8 @@ services: image: $W9_REPO:$W9_VERSION container_name: $W9_ID ports: - - $W9_HTTP_PORT_SET:$W9_HTTP_PORT - - $W9_GRPC_PORT_SET:$W9_GRPC_PORT + - '$W9_HTTP_PORT_SET:$W9_HTTP_PORT' + - '$W9_GRPC_PORT_SET:$W9_GRPC_PORT' volumes: - pydio:/var/cells - ./src/install-conf.yml:/pydio/config/install.yml:ro