Skip to content

Commit 10d6edd

Browse files
authored
Merge branch 'master' into add-missing-s3-variables
2 parents 41b0648 + 0350039 commit 10d6edd

File tree

13 files changed

+179
-104
lines changed

13 files changed

+179
-104
lines changed

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.12
143+
ENV NEXTCLOUD_VERSION 28.0.14
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.12.tar.bz2"; \
154-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
153+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
154+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.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/fpm-alpine/Dockerfile

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

122122

123-
ENV NEXTCLOUD_VERSION 28.0.12
123+
ENV NEXTCLOUD_VERSION 28.0.14
124124

125125
RUN set -ex; \
126126
apk add --no-cache --virtual .fetch-deps \
127127
bzip2 \
128128
gnupg \
129129
; \
130130
\
131-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
132-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
131+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
132+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2.asc"; \
133133
export GNUPGHOME="$(mktemp -d)"; \
134134
# gpg key from https://nextcloud.com/nextcloud.asc
135135
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

28/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 28.0.12
128+
ENV NEXTCLOUD_VERSION 28.0.14
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-28.0.12.tar.bz2"; \
139-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
138+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.tar.bz2"; \
139+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.14.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; \

29/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 29.0.9
143+
ENV NEXTCLOUD_VERSION 29.0.10
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-29.0.9.tar.bz2"; \
154-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
153+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2"; \
154+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.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; \

29/fpm-alpine/Dockerfile

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

122122

123-
ENV NEXTCLOUD_VERSION 29.0.9
123+
ENV NEXTCLOUD_VERSION 29.0.10
124124

125125
RUN set -ex; \
126126
apk add --no-cache --virtual .fetch-deps \
127127
bzip2 \
128128
gnupg \
129129
; \
130130
\
131-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
132-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
131+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2"; \
132+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2.asc"; \
133133
export GNUPGHOME="$(mktemp -d)"; \
134134
# gpg key from https://nextcloud.com/nextcloud.asc
135135
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

29/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 29.0.9
128+
ENV NEXTCLOUD_VERSION 29.0.10
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-29.0.9.tar.bz2"; \
139-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
138+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.tar.bz2"; \
139+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.10.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; \

30/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 30.0.2
143+
ENV NEXTCLOUD_VERSION 30.0.4
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-30.0.2.tar.bz2"; \
154-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
153+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
154+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.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; \

30/fpm-alpine/Dockerfile

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

122122

123-
ENV NEXTCLOUD_VERSION 30.0.2
123+
ENV NEXTCLOUD_VERSION 30.0.4
124124

125125
RUN set -ex; \
126126
apk add --no-cache --virtual .fetch-deps \
127127
bzip2 \
128128
gnupg \
129129
; \
130130
\
131-
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
132-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
131+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
132+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2.asc"; \
133133
export GNUPGHOME="$(mktemp -d)"; \
134134
# gpg key from https://nextcloud.com/nextcloud.asc
135135
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \

30/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 30.0.2
128+
ENV NEXTCLOUD_VERSION 30.0.4
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-30.0.2.tar.bz2"; \
139-
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
138+
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.tar.bz2"; \
139+
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.4.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; \

0 commit comments

Comments
 (0)