Skip to content

Commit 1f501a6

Browse files
committed
Use occ in entrypoint
Signed-off-by: Daniel Rudolf <[email protected]>
1 parent b53895f commit 1f501a6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

docker-entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
163163
exit 1
164164
fi
165165
echo "Upgrading nextcloud from $installed_version ..."
166-
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
166+
run_as 'occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
167167
fi
168168
if [ "$(id -u)" = 0 ]; then
169169
rsync_options="-rlDog --chown $user:$group"
@@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
225225
echo "Starting nextcloud installation"
226226
max_retries=10
227227
try=0
228-
until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
228+
until run_as "occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
229229
do
230230
echo "Retrying install..."
231231
try=$((try+1))
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
NC_TRUSTED_DOMAIN_IDX=1
241241
for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
242242
DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
243-
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
243+
run_as "occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
244244
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
245245
done
246246
fi
@@ -254,9 +254,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
254254
else
255255
run_path pre-upgrade
256256

257-
run_as 'php /var/www/html/occ upgrade'
257+
run_as 'occ upgrade'
258258

259-
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
259+
run_as 'occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
260260
echo "The following apps have been disabled:"
261261
diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
262262
rm -f /tmp/list_before /tmp/list_after
@@ -269,7 +269,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
269269

270270
# Update htaccess after init if requested
271271
if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
272-
run_as 'php /var/www/html/occ maintenance:update:htaccess'
272+
run_as 'occ maintenance:update:htaccess'
273273
fi
274274
) 9> /var/www/html/nextcloud-init-sync.lock
275275

0 commit comments

Comments
 (0)