hoellen/docker-nextcloud
1
0
Fork 0
mirror of https://github.com/hoellen/docker-nextcloud.git synced 2025-04-20 04:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: hoellen:5aff93991de4e7a3365a93c52fb2f2e910a75813
Branches Tags
hoellen:master
hoellen:version-29
hoellen:version-30
hoellen:version-28
hoellen:version-27
hoellen:version-26
hoellen:version-25
hoellen:version-24
hoellen:version-23
hoellen:version-22
...
compare: hoellen:df325e20d875abd702a159fcb303fab1bece33c1
Branches Tags
hoellen:master
hoellen:version-29
hoellen:version-30
hoellen:version-28
hoellen:version-27
hoellen:version-26
hoellen:version-25
hoellen:version-24
hoellen:version-23
hoellen:version-22

3 Commits
5aff93991d ... df325e20d8

Author SHA1 Message Date
waja
df325e20d8
Merge 40b2779cfbbf0e4614c5ee81bb47c42ec789235e into 2334b3e2314a899a326967570c6e68ded6d474b2 2023-10-30 10:19:47 +01:00
Jan Wagner
2334b3e231 chore: update Nextcloud to 27.1.3 2023-10-30 10:18:22 +01:00
Jan Wagner
40b2779cfb Check if db is available, not just in setup 
Checking for a available database when installing is fine, but running
occ upgrade without a db available is also a problem. This checks for db
availability in every case.
 2023-10-11 12:19:09 +02:00
3 changed files with 12 additions and 11 deletions
Show Stats Expand all files Collapse all files

6
Dockerfile
View File

@ -1,5 +1,5 @@
# -------------- Build-time variables --------------
ARG NEXTCLOUD_VERSION=27.1.2
ARG NEXTCLOUD_VERSION=27.1.3
ARG PHP_VERSION=8.2
ARG NGINX_VERSION=1.24
@ -10,8 +10,8 @@ ARG SNUFFLEUPAGUS_VERSION=0.10.0
ARG UID=1000
ARG GID=1000
# nextcloud-27.1.2.tar.bz2
ARG SHA256_SUM="0742b247aaee0b7044db0062f0a914aa77338c7a7d8fe7da0917147d76689721"
# nextcloud-27.1.3.tar.bz2
ARG SHA256_SUM="1d614935245e4a375b4ac991c02f323592b753972f86f88763fd80ed7d275793"
# Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"

9
rootfs/usr/local/bin/run.sh
View File

@ -15,6 +15,15 @@ if [ "$PHP_HARDENING" == "true" ] && [ ! -f /usr/local/etc/php/conf.d/snuffleupa
cp /usr/local/etc/php/snuffleupagus/* /usr/local/etc/php/conf.d
fi
# Check if database is available
if [ ${DB_TYPE} != "sqlite3" ]; then
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
do
echo "waiting for the database container..."
sleep 1
done
fi
# If new install, run setup
if [ ! -f /nextcloud/config/config.php ]; then
touch /nextcloud/config/CAN_INSTALL

8
rootfs/usr/local/bin/setup.sh
View File

@ -55,14 +55,6 @@ cat >> /nextcloud/config/autoconfig.php <<EOF;
?>
EOF
if [ ${DB_TYPE} != "sqlite3" ]; then
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
do
echo "waiting for the database container..."
sleep 1
done
fi
echo "Starting automatic configuration..."
# Execute setup
(cd /nextcloud; php index.php &>/dev/null)