Skip to content

Commit 46b8caa

Browse files
jessebotjessebot
authored
Merge branch 'nextcloud:master' into add-imagemagick-svg
2 parents 4ac47a9 + cd162a4 commit 46b8caa

22 files changed

Lines changed: 159 additions & 37 deletions

‎27/apache/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ RUN { \
140140
} > /etc/apache2/conf-available/apache-limits.conf; \
141141
a2enconf apache-limits
142142

143-
ENV NEXTCLOUD_VERSION 27.1.10
143+
ENV NEXTCLOUD_VERSION 27.1.11
144144

145145
RUN set -ex; \
146146
fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
150150
apt-get update; \
151151
apt-get install -y --no-install-recommends $fetchDeps; \
152152
\
153-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2"; \
154-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2.asc"; \
153+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
154+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
155155
export GNUPGHOME="$(mktemp -d)"; \
156156
# gpg key from https://nextcloud.com/nextcloud.asc
157157
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

‎27/apache/entrypoint.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
276276
fi
277277
) 9> /var/www/html/nextcloud-init-sync.lock
278278

279+
# warn if config files on persistent storage differ from the latest version of this image
280+
for cfgPath in /usr/src/nextcloud/config/*.php; do
281+
cfgFile=$(basename "$cfgPath")
282+
283+
if [ "$cfgFile" != "config.sample.php" ]; then
284+
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
285+
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
286+
fi
287+
fi
288+
done
289+
279290
run_path before-starting
280291
fi
281292

‎27/fpm-alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,16 @@ RUN { \
114114
VOLUME /var/www/html
115115

116116

117-
ENV NEXTCLOUD_VERSION 27.1.10
117+
ENV NEXTCLOUD_VERSION 27.1.11
118118

119119
RUN set -ex; \
120120
apk add --no-cache --virtual .fetch-deps \
121121
bzip2 \
122122
gnupg \
123123
; \
124124
\
125-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2"; \
126-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2.asc"; \
125+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
126+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
127127
export GNUPGHOME="$(mktemp -d)"; \
128128
# gpg key from https://nextcloud.com/nextcloud.asc
129129
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

‎27/fpm-alpine/entrypoint.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
276276
fi
277277
) 9> /var/www/html/nextcloud-init-sync.lock
278278

279+
# warn if config files on persistent storage differ from the latest version of this image
280+
for cfgPath in /usr/src/nextcloud/config/*.php; do
281+
cfgFile=$(basename "$cfgPath")
282+
283+
if [ "$cfgFile" != "config.sample.php" ]; then
284+
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
285+
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
286+
fi
287+
fi
288+
done
289+
279290
run_path before-starting
280291
fi
281292

‎27/fpm/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ RUN { \
125125
VOLUME /var/www/html
126126

127127

128-
ENV NEXTCLOUD_VERSION 27.1.10
128+
ENV NEXTCLOUD_VERSION 27.1.11
129129

130130
RUN set -ex; \
131131
fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
135135
apt-get update; \
136136
apt-get install -y --no-install-recommends $fetchDeps; \
137137
\
138-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2"; \
139-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.10.tar.bz2.asc"; \
138+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
139+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
140140
export GNUPGHOME="$(mktemp -d)"; \
141141
# gpg key from https://nextcloud.com/nextcloud.asc
142142
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

‎27/fpm/entrypoint.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
276276
fi
277277
) 9> /var/www/html/nextcloud-init-sync.lock
278278

279+
# warn if config files on persistent storage differ from the latest version of this image
280+
for cfgPath in /usr/src/nextcloud/config/*.php; do
281+
cfgFile=$(basename "$cfgPath")
282+
283+
if [ "$cfgFile" != "config.sample.php" ]; then
284+
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
285+
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
286+
fi
287+
fi
288+
done
289+
279290
run_path before-starting
280291
fi
281292

‎28/apache/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ RUN { \
140140
} > /etc/apache2/conf-available/apache-limits.conf; \
141141
a2enconf apache-limits
142142

143-
ENV NEXTCLOUD_VERSION 28.0.6
143+
ENV NEXTCLOUD_VERSION 28.0.7
144144

145145
RUN set -ex; \
146146
fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
150150
apt-get update; \
151151
apt-get install -y --no-install-recommends $fetchDeps; \
152152
\
153-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2"; \
154-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2.asc"; \
153+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2"; \
154+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
155155
export GNUPGHOME="$(mktemp -d)"; \
156156
# gpg key from https://nextcloud.com/nextcloud.asc
157157
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

‎28/apache/entrypoint.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
276276
fi
277277
) 9> /var/www/html/nextcloud-init-sync.lock
278278

279+
# warn if config files on persistent storage differ from the latest version of this image
280+
for cfgPath in /usr/src/nextcloud/config/*.php; do
281+
cfgFile=$(basename "$cfgPath")
282+
283+
if [ "$cfgFile" != "config.sample.php" ]; then
284+
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
285+
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
286+
fi
287+
fi
288+
done
289+
279290
run_path before-starting
280291
fi
281292

‎28/fpm-alpine/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,16 @@ RUN { \
114114
VOLUME /var/www/html
115115

116116

117-
ENV NEXTCLOUD_VERSION 28.0.6
117+
ENV NEXTCLOUD_VERSION 28.0.7
118118

119119
RUN set -ex; \
120120
apk add --no-cache --virtual .fetch-deps \
121121
bzip2 \
122122
gnupg \
123123
; \
124124
\
125-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2"; \
126-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.6.tar.bz2.asc"; \
125+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2"; \
126+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.7.tar.bz2.asc"; \
127127
export GNUPGHOME="$(mktemp -d)"; \
128128
# gpg key from https://nextcloud.com/nextcloud.asc
129129
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

‎28/fpm-alpine/entrypoint.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,17 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
276276
fi
277277
) 9> /var/www/html/nextcloud-init-sync.lock
278278

279+
# warn if config files on persistent storage differ from the latest version of this image
280+
for cfgPath in /usr/src/nextcloud/config/*.php; do
281+
cfgFile=$(basename "$cfgPath")
282+
283+
if [ "$cfgFile" != "config.sample.php" ]; then
284+
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
285+
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
286+
fi
287+
fi
288+
done
289+
279290
run_path before-starting
280291
fi
281292

0 commit comments

Comments
 (0)