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

Jump to bottom

[Issue-73360] Fix installation precheck for SuiteCRM #74053

Closed
wants to merge 1 commit into from
Closed

[Issue-73360] Fix installation precheck for SuiteCRM #74053

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
2 changes: 1 addition & 1 deletion bitnami/pgpool/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
- REPMGR_USERNAME=repmgr
- REPMGR_PASSWORD=repmgrpassword
pgpool:
image: docker.io/bitnami/pgpool:4
image: david-pgpool
ports:
- 5432:5432
environment:
Expand Down
9 changes: 5 additions & 4 deletions bitnami/suitecrm/8/debian-12/rootfs/opt/bitnami/scripts/libsuitecrm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,14 @@ suitecrm_initialize() {
# Delete configuration file for silent install as it's not needed anymore
rm "$SUITECRM_SILENT_INSTALL_CONF_FILE"
else
web_server_start
suitecrm_pass_wizard
# Configure SMTP via application wizard
if ! is_empty_value "$SUITECRM_SMTP_HOST"; then
web_server_start
info "Configuring SMTP"
suitecrm_pass_smtp_wizard
web_server_stop
fi
web_server_stop
fi

else
Expand Down Expand Up @@ -358,11 +358,12 @@ suitecrm_pass_smtp_wizard() {
suitecrm_pass_wizard() {
local -a install_args
local url_protocol=http
local -r url_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}"
info "Running setup wizard"
is_boolean_yes "$SUITECRM_ENABLE_HTTPS" && url_protocol=https
is_boolean_yes "$SUITECRM_ENABLE_HTTPS" && url_protocol=https url_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}"

install_args=(
"--site_host=${url_protocol}://${SUITECRM_HOST}"
"--site_host=${url_protocol}://${SUITECRM_HOST}:${url_port}"
"--site_username=${SUITECRM_USERNAME}"
"--site_password=${SUITECRM_PASSWORD}"
"--db_username=${SUITECRM_DATABASE_USER}"
Expand Down
3 changes: 2 additions & 1 deletion bitnami/suitecrm/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ services:
volumes:
- 'mariadb_data:/bitnami/mariadb'
suitecrm:
image: docker.io/bitnami/suitecrm:8
image: david-suitecrm
ports:
- '80:8080'
- '443:8443'
environment:
- SUITECRM_ENABLE_HTTPS=true
- SUITECRM_DATABASE_HOST=mariadb
- SUITECRM_DATABASE_PORT_NUMBER=3306
- SUITECRM_DATABASE_USER=bn_suitecrm
Expand Down
Loading