mirror of
https://github.com/nextcloud/docker.git
synced 2024-09-30 00:12:36 +02:00
Compare commits
6 commits
d86e957114
...
9c516ffdc6
Author | SHA1 | Date | |
---|---|---|---|
|
9c516ffdc6 | ||
|
f6d767efb1 | ||
|
30b570f0b5 | ||
|
2bc1036e61 | ||
|
a1e93f429c | ||
|
5f26f842c3 |
21 changed files with 28 additions and 23 deletions
|
@ -65,7 +65,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -63,7 +63,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -65,7 +65,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -65,7 +65,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -63,7 +63,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -65,7 +65,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -65,7 +65,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -63,7 +63,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -65,7 +65,7 @@ RUN set -ex; \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.23; \
|
pecl install APCu-5.1.24; \
|
||||||
pecl install imagick-3.7.0; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install memcached-3.2.0; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install redis-6.0.2; \
|
pecl install redis-6.0.2; \
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
11
README.md
11
README.md
|
@ -482,9 +482,15 @@ When using docker-compose your compose file takes care of your configuration, so
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ docker-compose pull
|
$ docker-compose pull
|
||||||
|
$ docker-compose build
|
||||||
$ docker-compose up -d
|
$ docker-compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
|
After the container is started up, run the database migrations:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ docker-compose exec --user www-data app php occ db:add-missing-indices
|
||||||
|
```
|
||||||
|
|
||||||
# Adding Features
|
# Adding Features
|
||||||
A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it. Start your derived image with the `FROM` statement and add whatever you like.
|
A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it. Start your derived image with the `FROM` statement and add whatever you like.
|
||||||
|
@ -533,12 +539,11 @@ docker run -d your-name
|
||||||
|
|
||||||
or for docker-compose:
|
or for docker-compose:
|
||||||
```console
|
```console
|
||||||
docker-compose build --pull
|
docker-compose pull
|
||||||
|
docker-compose build
|
||||||
docker-compose up -d
|
docker-compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
|
|
||||||
|
|
||||||
# Migrating an existing installation
|
# Migrating an existing installation
|
||||||
You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
|
You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
|
||||||
|
|
||||||
|
|
|
@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -Eeuo pipefail
|
set -Eeuo pipefail
|
||||||
|
|
||||||
stable_channel='29.0.6'
|
stable_channel='29.0.7'
|
||||||
|
|
||||||
self="$(basename "$BASH_SOURCE")"
|
self="$(basename "$BASH_SOURCE")"
|
||||||
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||||
|
|
Loading…
Reference in a new issue