adphi/Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- using defaults from autoconfig.php

Browse Source 
- using '-n' instead of '! -z'
- adding quotes
This commit is contained in:
Marc Brückner 2018-09-13 11:32:56 +02:00
parent 7f485eb9fa
commit f5d3234fca
10 changed files with 80 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
12.0/apache/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
12.0/fpm-alpine/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
12.0/fpm/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
13.0/apache/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
13.0/fpm-alpine/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
13.0/fpm/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
14.0/apache/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
14.0/fpm-alpine/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
14.0/fpm/entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"

14
docker-entrypoint.sh
View File

@ -53,27 +53,29 @@ if version_greater "$image_version" "$installed_version"; then
if [ "$installed_version" = "0.0.0.0" ]; then if [ "$installed_version" = "0.0.0.0" ]; then
echo "New nextcloud instance" echo "New nextcloud instance"
if [ ! -z ${NEXTCLOUD_ADMIN_USER+x} ] && [ ! -z ${NEXTCLOUD_ADMIN_PASSWORD+x} ]; then if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\"" install_options="-n --admin-user \"$NEXTCLOUD_ADMIN_USER\" --admin-pass \"$NEXTCLOUD_ADMIN_PASSWORD\""
if [ ! -z ${NEXTCLOUD_TABLE_PREFIX+x} ]; then if [ -n "${NEXTCLOUD_TABLE_PREFIX+x}" ]; then
install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\"" install_options="$install_options --database-table-prefix \"$NEXTCLOUD_TABLE_PREFIX\""
else
install_options="$install_options --database-table-prefix \"\""
fi fi
if [ ! -z ${NEXTCLOUD_DATA_DIR+x} ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\"" install_options="$install_options --data-dir \"$NEXTCLOUD_DATA_DIR\""
fi fi
if [ ! -z ${SQLITE_DATABASE+x} ]; then if [ -n "${SQLITE_DATABASE+x}" ]; then
echo "Installing with SQLite database" echo "Installing with SQLite database"
install_options="$install_options --database-name \"$SQLITE_DATABASE\"" install_options="$install_options --database-name \"$SQLITE_DATABASE\""
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${MYSQL_DATABASE+x} ] && [ ! -z ${MYSQL_USER+x} ] && [ ! -z ${MYSQL_PASSWORD+x} ] && [ ! -z ${MYSQL_HOST+x} ]; then elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
echo "Installing with MySQL database" echo "Installing with MySQL database"
install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\"" install_options="$install_options --database mysql --database-name \"$MYSQL_DATABASE\" --database-user \"$MYSQL_USER\" --database-pass \"$MYSQL_PASSWORD\" --database-host \"$MYSQL_HOST\""
echo "waiting 30s for the database to setup" echo "waiting 30s for the database to setup"
sleep 30s sleep 30s
echo "starting nexcloud installation" echo "starting nexcloud installation"
run_as "php /var/www/html/occ maintenance:install $install_options" run_as "php /var/www/html/occ maintenance:install $install_options"
elif [ ! -z ${POSTGRES_DB+x} ] && [ ! -z ${POSTGRES_USER+x} ] && [ ! -z ${POSTGRES_PASSWORD+x} ] && [ ! -z ${POSTGRES_HOST+x} ]; then elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
echo "Installing with PostgreSQL database" echo "Installing with PostgreSQL database"
install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\"" install_options="$install_options --database pgsql --database-name \"$POSTGRES_DB\" --database-user \"$POSTGRES_USER\" --database-pass \"$POSTGRES_PASSWORD\" --database-host \"$POSTGRES_HOST\""
echo "waiting 10s for the database to setup" echo "waiting 10s for the database to setup"