Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update docker-compose-magnus.yml #372

Merged
merged 1 commit into from
Dec 20, 2023
Merged

feat: Update docker-compose-magnus.yml #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compose/docker-compose-magnus-xpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ services:
magnus:
ports:
- ${MAGNUS_POSTGRESQL_PORT:-54320}:54320
- ${MAGNUS_ORACLE_PORTS:-30000-30030}:${MAGNUS_ORACLE_PORTS:-30000-30030}
- ${MAGNUS_SQLSERVER_PORT:-14330}:14330
- ${MAGNUS_ORACLE_PORTS:-30000-30030}:${MAGNUS_ORACLE_PORTS:-30000-30030}
3 changes: 2 additions & 1 deletion compose/docker-compose-magnus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- ${MAGNUS_MYSQL_PORT:-33061}:33061
- ${MAGNUS_MARIADB_PORT:-33062}:33062
- ${MAGNUS_REDIS_PORT:-63790}:63790
- ${MAGNUS_SQLSERVER_PORT:-14330}:14330
volumes:
- ${CONFIG_DIR}/certs:/opt/magnus/data/certs
- ${VOLUME_DIR}/magnus/data:/opt/magnus/data
Expand All @@ -25,4 +26,4 @@ services:
retries: 3
start_period: 10s
networks:
- net
- net
1 change: 1 addition & 0 deletions config-example.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ MAGNUS_MYSQL_PORT=33061
MAGNUS_MARIADB_PORT=33062
MAGNUS_REDIS_PORT=63790
MAGNUS_POSTGRESQL_PORT=54320
MAGNUS_SQLSERVER_PORT=14330
MAGNUS_ORACLE_PORTS=30000-30030

################################# HTTPS 配置 #################################
Expand Down
15 changes: 10 additions & 5 deletions scripts/7_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,26 @@ function upgrade_config() {
RDP_PORT=3389
set_config RDP_PORT "${RDP_PORT}"
fi
xrdp_port=$(get_config XRDP_PORT)
if [ -z "${xrdp_port}" ]; then
XRDP_PORT=3390
set_config XRDP_PORT "${XRDP_PORT}"
fi
magnus_postgresql_port=$(get_config MAGNUS_POSTGRESQL_PORT)
if [ -z "${magnus_postgresql_port}" ]; then
MAGNUS_POSTGRESQL_PORT=54320
set_config MAGNUS_POSTGRESQL_PORT "${MAGNUS_POSTGRESQL_PORT}"
fi
magnus_sqlserver_port=$(get_config MAGNUS_SQLSERVER_PORT)
if [ -z "${magnus_sqlserver_port}" ]; then
MAGNUS_SQLSERVER_PORT=14330
set_config MAGNUS_SQLSERVER_PORT "${MAGNUS_SQLSERVER_PORT}"
fi
magnus_oracle_ports=$(get_config MAGNUS_ORACLE_PORTS)
if [ -z "${magnus_oracle_ports}" ]; then
MAGNUS_ORACLE_PORTS=30000-30030
set_config MAGNUS_ORACLE_PORTS "${MAGNUS_ORACLE_PORTS}"
fi
xrdp_port=$(get_config XRDP_PORT)
if [ -z "${xrdp_port}" ]; then
XRDP_PORT=3390
set_config XRDP_PORT "${XRDP_PORT}"
fi
fi
}

Expand Down