Compare commits

...

42 Commits

Author SHA1 Message Date
Simon L
f86032a7e4 increase to 6.4.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-21 00:45:43 +02:00
Simon L
2f842e7266 also add it to libusrtctp to normal container
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 18:11:31 +02:00
Simon L
2c26a1957c fix compiling janus with datachannel support
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 17:52:30 +02:00
Simon L
5b7c9a096f fix bind propagation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 16:44:24 +02:00
Simon L
86f606b407 remove cr release notes again since they dont work correctly
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 16:10:59 +02:00
Simon L
dc36781035 Merge pull request #2958 from nextcloud/dependabot/docker/Containers/talk/nats-2.9.20-scratch
Bump nats from 2.9.19-scratch to 2.9.20-scratch in /Containers/talk
2023-07-20 16:10:03 +02:00
Simon L
00557fecd2 Merge pull request #2601 from nextcloud/enh/2585/volume-mounts
set NEXTCLOUD_MOUNT to rshared
2023-07-20 16:07:48 +02:00
dependabot[bot]
de14dd2052 Bump nats from 2.9.19-scratch to 2.9.20-scratch in /Containers/talk
Bumps nats from 2.9.19-scratch to 2.9.20-scratch.

---
updated-dependencies:
- dependency-name: nats
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-20 14:05:21 +00:00
Simon L
40dfd4cdf1 Merge pull request #2998 from nextcloud/aio-helm-update
Helm Chart updates
2023-07-20 16:04:41 +02:00
szaimen
fb6ca4b6af Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-07-20 13:54:51 +00:00
Simon L
b5831bf346 Merge pull request #2983 from nextcloud/enh/noid/display-warning-domaincheck
display warning if domaincheck container could not be started instead of bugging out
2023-07-20 15:54:39 +02:00
Simon L
c7363d9ec1 Merge pull request #2981 from nextcloud/enh/noid/make-tmp-a-tmpfs
nextcloud container - make /tmp a tmpfs
2023-07-20 15:54:29 +02:00
Simon L
9cdcb6be92 Merge pull request #2971 from nextcloud/enh/noid/remove-cgi-bin
remove cgi-bin scripts
2023-07-20 15:54:18 +02:00
Simon L
5005f09dea Merge pull request #2700 from nextcloud/enh/2332/update-es-to-8
update to ES 8 and add necessary adjustements to its config
2023-07-20 15:54:05 +02:00
Simon L
a51ad39dee Merge pull request #2880 from nextcloud/enh/noid/talk-recording-allow-all
talk-recording - set allow_all and skip_verify via env
2023-07-20 15:53:22 +02:00
Simon L
a262d1f210 add HPB_PATH
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 15:52:45 +02:00
Simon L
0c5cb7de25 also allow to adjust the protocol
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 15:52:45 +02:00
Simon L
7bb7545972 talk-recording - set allow_all and skip_verify via env
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-20 15:52:45 +02:00
Simon L
2399728731 Merge pull request #2886 from nextcloud/janus-0.x
build janus 0.x
2023-07-20 15:49:19 +02:00
Simon L
d91538dd78 Merge pull request #2937 from nextcloud/aio-yaml-update
Yaml updates
2023-07-20 15:43:52 +02:00
Simon L
8d77e179ab Merge pull request #2995 from nextcloud/nextcloud-container-update
Nextcloud update
2023-07-20 15:40:58 +02:00
Simon L
0406f91122 Merge pull request #2994 from nextcloud/talk-container-update
talk update
2023-07-20 15:40:39 +02:00
szaimen
1afbfdc9c5 nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-07-20 12:08:12 +00:00
szaimen
91bac10c9a talk-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-07-20 12:03:06 +00:00
szaimen
f56682b774 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-07-20 12:02:53 +00:00
Simon L
4065ab659c add explanation to namespace
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 17:08:17 +02:00
Simon L
7824060a6c set NEXTCLOUD_MOUNT to rshared
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 15:40:31 +02:00
Simon L
7ab1e951f5 modify git clone command and adjust indentation
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 15:21:40 +02:00
Zoey
a529fb9b39 Update Containers/talk/Dockerfile
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: Zoey <zoey@z0ey.de>
2023-07-19 15:15:13 +02:00
Simon L
91ee3495e1 move each dependency to a new line
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 15:04:42 +02:00
Zoey
77dbc79115 build janus 0.x
```
Compiler:                  gcc
libsrtp version:           2.x
SSL/crypto library:        OpenSSL
DTLS set-timeout:          not available
Mutex implementation:      GMutex (native futex on Linux)
DataChannels support:      no
Recordings post-processor: no
TURN REST API client:      no
Doxygen documentation:     no
Transports:
    REST (HTTP/HTTPS):     no
    WebSockets:            no
    RabbitMQ:              no
    MQTT:                  no
    Unix Sockets:          yes
    Nanomsg:               no
Plugins:
    Echo Test:             yes
    Streaming:             yes
    Video Call:            yes
    SIP Gateway:           no
    NoSIP (RTP Bridge):    yes
    Audio Bridge:          no
    Video Room:            yes
    Voice Mail:            no
    Record&Play:           yes
    Text Room:             yes
    Lua Interpreter:       no
    Duktape Interpreter:   no
Event handlers:
    Sample event handler:  no
    WebSocket ev. handler: no
    RabbitMQ event handler:no
    MQTT event handler:    no
    Nanomsg event handler: no
    GELF event handler:    yes
External loggers:
    JSON file logger:      no
JavaScript modules:        no
```

Signed-off-by: Zoey <zoey@z0ey.de>
2023-07-19 15:01:53 +02:00
Simon L
54d9181f14 display warning if domaincheck container could not be started instead of bugging out
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 14:37:48 +02:00
Simon L
7c38050f58 adjust a detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 14:12:13 +02:00
Simon L
e4f68f7636 remove FTS_PASSWORD again
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 14:10:24 +02:00
Simon L
d2be89c502 nextcloud container - make tmp a tmpfs
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-19 14:03:02 +02:00
Simon L
70b46093ab Merge pull request #2975 from nextcloud/enh/noid/adjust-helm-update
adjust helm-update script
2023-07-18 17:29:09 +02:00
Simon L
3dce533874 adjust helm-update script
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-18 17:27:35 +02:00
Simon L
87a2d6fd8e remove cgi-bin scripts
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-07-17 09:51:43 +02:00
Simon L
443fb67465 adjust detail
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-27 11:56:54 +02:00
Simon L
dedc25dc51 some more adjustments
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-27 11:53:06 +02:00
Simon L
2dfab2941b adjust a few things
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-27 11:51:53 +02:00
Simon L
faa5947963 update to ES 8 and add necessary adjustements to its config
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-06-07 14:43:09 +02:00
55 changed files with 476 additions and 152 deletions

View File

@@ -46,4 +46,3 @@ jobs:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_RELEASE_NAME_TEMPLATE: "helm-chart-{{ .Version }}"
CR_SKIP_EXISTING: true
CR_GENERATE_RELEASE_NOTES: true

View File

@@ -34,6 +34,16 @@ jobs:
)"
curl -L "https://raw.githubusercontent.com/strukturag/nextcloud-spreed-signaling/$signaling_version/server.conf.in" -o Containers/talk/server.conf.in
# Janus
janus_version="$(
git ls-remote https://github.com/meetecho/janus-gateway v0.*.* \
| cut -d/ -f3 \
| sort -V \
| grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" \
| tail -1
)"
sed -i "s|^ARG JANUS_VERSION=.*$|ARG JANUS_VERSION=$janus_version|" ./Containers/talk/Dockerfile
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:

View File

@@ -48,6 +48,7 @@ RUN set -ex; \
-e 's/^#\(LoadModule .*mod_brotli.so\)/\1/' \
-e 's/\(LoadModule .*mod_mpm_worker.so\)/#\1/' \
-e 's/\(LoadModule .*mod_mpm_prefork.so\)/#\1/' \
-e 's/\(ScriptAlias \)/#\1/' \
/usr/local/apache2/conf/httpd.conf; \
echo "Include conf/nextcloud.conf" | tee -a /usr/local/apache2/conf/httpd.conf; \
echo "ServerName localhost" | tee -a /usr/local/apache2/conf/httpd.conf; \
@@ -68,6 +69,7 @@ RUN set -ex; \
mkdir -p /usr/local/apache2/logs; \
chmod 777 -R /home/www-data; \
chmod 777 -R /usr/local/apache2/logs; \
rm -rf /usr/local/apache2/cgi-bin/; \
\
echo "root:$(openssl rand -base64 12)" | chpasswd

View File

@@ -1,5 +1,5 @@
# Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
FROM elasticsearch:7.17.10
FROM elasticsearch:8.8.0
USER root

View File

@@ -93,6 +93,7 @@ RUN set -ex; \
-e 's/^#\(LoadModule .*mod_mpm_event.so\)/\1/' \
-e 's/\(LoadModule .*mod_mpm_worker.so\)/#\1/' \
-e 's/\(LoadModule .*mod_mpm_prefork.so\)/#\1/' \
-e 's/\(ScriptAlias \)/#\1/' \
/etc/apache2/httpd.conf; \
mkdir -p /etc/apache2/logs; \
rm /etc/apache2/conf.d/ssl.conf; \
@@ -108,6 +109,7 @@ RUN set -ex; \
/etc/apache2/conf.d/userdir.conf \
/etc/apache2/conf.d/info.conf; \
\
rm -rf /var/www/localhost/cgi-bin/; \
mkdir /var/log/supervisord; \
mkdir /var/run/supervisord;

View File

@@ -3,7 +3,7 @@ FROM php:8.1.21-fpm-alpine3.18
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 10G
ENV PHP_MAX_TIME 3600
ENV NEXTCLOUD_VERSION 26.0.3
ENV NEXTCLOUD_VERSION 26.0.4
ENV AIO_TOKEN 123456
ENV AIO_URL localhost
@@ -209,6 +209,7 @@ RUN set -ex; \
chown www-data:root -R /usr/src && \
chown www-data:root -R /usr/local/etc/php/conf.d && \
chown www-data:root -R /usr/local/etc/php-fpm.d && \
chmod -R 777 /tmp; \
rm -r /usr/src/nextcloud/apps/updatenotification; \
\
mkdir -p /nc-updater; \

View File

@@ -2,7 +2,11 @@ FROM python:3.11.4-alpine3.18
COPY --chmod=775 start.sh /start.sh
ENV RECORDING_VERSION v17.0.1
ENV RECORDING_VERSION v17.0.2
ENV ALLOW_ALL false
ENV HPB_PROTOCOL https
ENV SKIP_VERIFY false
ENV HPB_PATH /standalone-signaling/
RUN set -ex; \
apk add --no-cache \

View File

@@ -21,26 +21,26 @@ level = 30
listen = 0.0.0.0:1234
[backend]
allowall = false
allowall = ${ALLOW_ALL}
# TODO: remove secret below when https://github.com/nextcloud/spreed/issues/9580 is fixed
secret = ${RECORDING_SECRET}
backends = backend-1
skipverify = false
skipverify = ${SKIP_VERIFY}
maxmessagesize = 1024
videowidth = 1920
videoheight = 1080
directory = /tmp
[backend-1]
url = https://${NC_DOMAIN}
url = ${HPB_PROTOCOL}://${NC_DOMAIN}
secret = ${RECORDING_SECRET}
skipverify = false
skipverify = ${SKIP_VERIFY}
[signaling]
signalings = signaling-1
[signaling-1]
url = https://${NC_DOMAIN}/standalone-signaling/
url = ${HPB_PROTOCOL}://${NC_DOMAIN}${HPB_PATH}
internalsecret = ${INTERNAL_SECRET}
[ffmpeg]

View File

@@ -1,41 +1,65 @@
FROM nats:2.9.19-scratch as nats
FROM nats:2.9.20-scratch as nats
FROM strukturag/nextcloud-spreed-signaling:1.1.3 as signaling
FROM alpine:3.18.2 as janus
ARG JANUS_VERSION=v0.13.4
WORKDIR /src
RUN set -ex; \
apk add --no-cache \
ca-certificates \
git \
autoconf \
automake \
build-base \
pkgconfig \
libtool \
util-linux \
glib-dev \
zlib-dev \
openssl-dev \
jansson-dev \
libnice-dev \
libconfig-dev \
libsrtp-dev \
libusrsctp-dev \
gengetopt-dev \
libwebsockets-dev; \
git clone --recursive https://github.com/meetecho/janus-gateway --depth=1 --single-branch --branch "$JANUS_VERSION" /src; \
/src/autogen.sh; \
/src/configure --disable-rabbitmq --disable-mqtt --disable-boringssl; \
make; \
make install; \
make configs; \
rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample
FROM coturn/coturn:4.6.2-alpine3.18
USER root
COPY --from=nats /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
COPY --chmod=775 start.sh /start.sh
COPY --chmod=664 supervisord.conf /supervisord.conf
RUN set -ex; \
apk add --no-cache \
ca-certificates \
tzdata \
bash \
janus-gateway \
openssl \
supervisor \
bind-tools \
netcat-openbsd \
shadow \
util-linux \
build-base \
wget \
lua5.3-dev \
luarocks5.3; \
\
glib \
zlib \
libssl3 \
libcrypto3 \
jansson \
libnice \
libconfig \
libsrtp \
libusrsctp \
libwebsockets \
\
shadow; \
useradd --system talk; \
luarocks-5.3 install luajson; \
luarocks-5.3 install ansicolors; \
rename -v ".jcfg.sample" ".jcfg" /etc/janus/*.sample; \
apk del --no-cache \
shadow \
util-linux \
build-base \
wget \
lua5.3-dev \
luarocks5.3; \
shadow; \
\
# Give root a random password
echo "root:$(openssl rand -base64 12)" | chpasswd; \
@@ -48,11 +72,10 @@ RUN set -ex; \
/conf \
/var/lib/turn \
/var/log/supervisord \
/var/lib/turn \
/var/run/supervisord; \
/var/run/supervisord \
/usr/local/lib/janus/loggers; \
chown talk:talk -R \
/usr \
/etc/janus \
/etc/nats.conf \
/var/lib/turn \
/var/log/supervisord \
@@ -64,6 +87,13 @@ RUN set -ex; \
/var/lib/turn \
/var/log/supervisord;
COPY --from=janus /usr/local /usr/local
COPY --from=nats /nats-server /usr/local/bin/nats-server
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
COPY --chmod=775 start.sh /start.sh
COPY --chmod=664 supervisord.conf /supervisord.conf
# Set default talk port https://github.com/nextcloud/all-in-one/issues/1011
ENV TALK_PORT=3478

View File

@@ -1,6 +1,5 @@
[supervisord]
nodaemon=true
nodaemon=true
logfile=/var/log/supervisord/supervisord.log
pidfile=/var/run/supervisord/supervisord.pid
childlogdir=/var/log/supervisord/
@@ -28,7 +27,7 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
# debug-level 3 means warning
command=janus --config=/etc/janus/janus.jcfg --disable-colors --log-stdout --full-trickle --debug-level 3
command=janus --config=/usr/local/etc/janus/janus.jcfg --disable-colors --log-stdout --full-trickle --debug-level 3
[program:signaling]
stdout_logfile=/dev/stdout

View File

@@ -27,6 +27,13 @@ services:
restart: unless-stopped
networks:
- nextcloud-aio
read_only: true
tmpfs:
- /var/log/supervisord
- /var/run/supervisord
- /usr/local/apache2/logs
- /tmp
- /home/www-data
nextcloud-aio-database:
image: nextcloud/aio-postgresql:latest
@@ -46,6 +53,9 @@ services:
shm_size: 268435456
networks:
- nextcloud-aio
read_only: true
tmpfs:
- /var/run/postgresql
nextcloud-aio-nextcloud:
depends_on:
@@ -180,6 +190,13 @@ services:
- talk-recording
networks:
- nextcloud-aio
read_only: true
tmpfs:
- /var/log/supervisord
- /var/run/supervisord
- /conf
- /var/lib/turn
- /tmp
nextcloud-aio-talk-recording:
image: nextcloud/aio-talk-recording:latest
@@ -196,6 +213,10 @@ services:
- talk-recording
networks:
- nextcloud-aio
read_only: true
tmpfs:
- /tmp
- /conf
nextcloud-aio-clamav:
image: nextcloud/aio-clamav:latest
@@ -248,6 +269,8 @@ services:
networks:
- nextcloud-aio
read_only: true
tmpfs:
- /tmp
nextcloud-aio-fulltextsearch:
image: nextcloud/aio-fulltextsearch:latest

View File

@@ -1,6 +1,6 @@
name: nextcloud-aio-helm-chart
description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
version: 6.2.1
version: 6.3.0
apiVersion: v2
keywords:
- latest

View File

@@ -2,11 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -15,8 +16,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-apache
@@ -29,7 +30,22 @@ spec:
- "777"
- /nextcloud-aio-nextcloud
- /nextcloud-aio-apache
- /nextcloud-aio-apache-tmpfs0
- /nextcloud-aio-apache-tmpfs1
- /nextcloud-aio-apache-tmpfs2
- /nextcloud-aio-apache-tmpfs3
- /nextcloud-aio-apache-tmpfs4
volumeMounts:
- name: nextcloud-aio-apache-tmpfs4
mountPath: /nextcloud-aio-apache-tmpfs4
- name: nextcloud-aio-apache-tmpfs3
mountPath: /nextcloud-aio-apache-tmpfs3
- name: nextcloud-aio-apache-tmpfs2
mountPath: /nextcloud-aio-apache-tmpfs2
- name: nextcloud-aio-apache-tmpfs1
mountPath: /nextcloud-aio-apache-tmpfs1
- name: nextcloud-aio-apache-tmpfs0
mountPath: /nextcloud-aio-apache-tmpfs0
- name: nextcloud-aio-apache
mountPath: /nextcloud-aio-apache
- name: nextcloud-aio-nextcloud
@@ -56,16 +72,33 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:20230626_101439-latest
image: nextcloud/aio-apache:20230720_134150-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}
hostPort: {{ .Values.APACHE_PORT }}
protocol: TCP
- containerPort: {{ .Values.APACHE_PORT }}
hostPort: {{ .Values.APACHE_PORT }}
protocol: UDP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud
readOnly: true
- mountPath: /mnt/data
name: nextcloud-aio-apache
- mountPath: /var/log/supervisord
name: nextcloud-aio-apache-tmpfs0
- mountPath: /var/run/supervisord
name: nextcloud-aio-apache-tmpfs1
- mountPath: /usr/local/apache2/logs
name: nextcloud-aio-apache-tmpfs2
- mountPath: /tmp
name: nextcloud-aio-apache-tmpfs3
- mountPath: /home/www-data
name: nextcloud-aio-apache-tmpfs4
volumes:
- name: nextcloud-aio-nextcloud
persistentVolumeClaim:
@@ -73,3 +106,13 @@ spec:
- name: nextcloud-aio-apache
persistentVolumeClaim:
claimName: nextcloud-aio-apache
- emptyDir: {}
name: nextcloud-aio-apache-tmpfs0
- emptyDir: {}
name: nextcloud-aio-apache-tmpfs1
- emptyDir: {}
name: nextcloud-aio-apache-tmpfs2
- emptyDir: {}
name: nextcloud-aio-apache-tmpfs3
- emptyDir: {}
name: nextcloud-aio-apache-tmpfs4

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,16 +2,21 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-apache
name: nextcloud-aio-apache
namespace: {{ values.NAMESPACE }}
spec:
type: LoadBalancer
ports:
- name: "{{ .Values.APACHE_PORT }}"
port: {{ .Values.APACHE_PORT }}
targetPort: {{ .Values.APACHE_PORT }}
- name: {{ .Values.APACHE_PORT }}-udp
port: {{ .Values.APACHE_PORT }}
protocol: UDP
targetPort: {{ .Values.APACHE_PORT }}
selector:
io.kompose.service: nextcloud-aio-apache

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,8 +17,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-clamav
@@ -47,10 +48,14 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20230626_101439-latest
image: nextcloud/aio-clamav:20230720_134150-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310
hostPort: 3310
protocol: TCP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /var/lib/clamav
name: nextcloud-aio-clamav

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -3,11 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-clamav
name: nextcloud-aio-clamav
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "3310"

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,8 +17,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-collabora
@@ -36,8 +37,10 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json
- name: server_name
value: "{{ .Values.NC_DOMAIN }}"
image: nextcloud/aio-collabora:20230626_101439-latest
image: nextcloud/aio-collabora:20230720_134150-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980
hostPort: 9980
protocol: TCP
{{- end }}

View File

@@ -3,11 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-collabora
name: nextcloud-aio-collabora
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "9980"

View File

@@ -2,11 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -15,8 +16,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-database
@@ -30,7 +31,10 @@ spec:
- /nextcloud-aio-database/data
- /nextcloud-aio-database
- /nextcloud-aio-database-dump
- /nextcloud-aio-database-tmpfs0
volumeMounts:
- name: nextcloud-aio-database-tmpfs0
mountPath: /nextcloud-aio-database-tmpfs0
- name: nextcloud-aio-database-dump
mountPath: /nextcloud-aio-database-dump
- name: nextcloud-aio-database
@@ -43,7 +47,10 @@ spec:
- "-R"
- /nextcloud-aio-database
- /nextcloud-aio-database-dump
- /nextcloud-aio-database-tmpfs0
volumeMounts:
- name: nextcloud-aio-database-tmpfs0
mountPath: /nextcloud-aio-database-tmpfs0
- name: nextcloud-aio-database-dump
mountPath: /nextcloud-aio-database-dump
- name: nextcloud-aio-database
@@ -60,16 +67,22 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20230626_101439-latest
image: nextcloud/aio-postgresql:20230720_134150-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432
hostPort: 5432
protocol: TCP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /var/lib/postgresql/data
subPath: data
name: nextcloud-aio-database
- mountPath: /mnt/data
name: nextcloud-aio-database-dump
- mountPath: /var/run/postgresql
name: nextcloud-aio-database-tmpfs0
terminationGracePeriodSeconds: 1800
volumes:
- name: nextcloud-aio-database
@@ -78,3 +91,5 @@ spec:
- name: nextcloud-aio-database-dump
persistentVolumeClaim:
claimName: nextcloud-aio-database-dump
- emptyDir: {}
name: nextcloud-aio-database-tmpfs0

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-database-dump
name: nextcloud-aio-database-dump
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,11 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-database
name: nextcloud-aio-database
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "5432"

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-elasticsearch
name: nextcloud-aio-elasticsearch
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,8 +17,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-fulltextsearch
@@ -42,10 +43,12 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: discovery.type
value: single-node
image: nextcloud/aio-fulltextsearch:20230626_101439-latest
image: nextcloud/aio-fulltextsearch:20230720_134150-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200
hostPort: 9200
protocol: TCP
volumeMounts:
- mountPath: /usr/share/elasticsearch/data
name: nextcloud-aio-elasticsearch

View File

@@ -3,11 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-fulltextsearch
name: nextcloud-aio-fulltextsearch
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "9200"

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,22 +17,41 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-imaginary
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-imaginary-tmpfs0
volumeMounts:
- name: nextcloud-aio-imaginary-tmpfs0
mountPath: /nextcloud-aio-imaginary-tmpfs0
containers:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20230626_101439-latest
image: nextcloud/aio-imaginary:20230720_134150-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000
hostPort: 9000
protocol: TCP
securityContext:
capabilities:
add:
- SYS_NICE
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /tmp
name: nextcloud-aio-imaginary-tmpfs0
volumes:
- emptyDir: {}
name: nextcloud-aio-imaginary-tmpfs0
{{- end }}

View File

@@ -3,11 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-imaginary
name: nextcloud-aio-imaginary
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "9000"

View File

@@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: {{ values.NAMESPACE }}
namespace: {{ values.NAMESPACE }}
spec: {}

View File

@@ -1,13 +0,0 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: nextcloud-aio
spec:
ingress:
- from:
- podSelector:
matchLabels:
io.kompose.network/nextcloud-aio: "true"
podSelector:
matchLabels:
io.kompose.network/nextcloud-aio: "true"

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud-data
name: nextcloud-aio-nextcloud-data
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,11 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -15,8 +16,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-nextcloud
@@ -116,10 +117,12 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:20230626_101439-latest
image: nextcloud/aio-nextcloud:20230720_134150-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000
hostPort: 9000
protocol: TCP
volumeMounts:
- mountPath: /var/www/html
name: nextcloud-aio-nextcloud

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,11 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-nextcloud
name: nextcloud-aio-nextcloud
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "9000"

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-nextcloud-trusted-cacerts
name: nextcloud-aio-nextcloud-trusted-cacerts
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,11 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -15,8 +16,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-notify-push
@@ -49,10 +50,14 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: nextcloud/aio-notify-push:20230626_101439-latest
image: nextcloud/aio-notify-push:20230720_134150-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867
hostPort: 7867
protocol: TCP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /nextcloud
name: nextcloud-aio-nextcloud

View File

@@ -2,11 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-notify-push
name: nextcloud-aio-notify-push
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "7867"

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,8 +17,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-onlyoffice
@@ -42,10 +43,12 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20230626_101439-latest
image: nextcloud/aio-onlyoffice:20230720_134150-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80
hostPort: 80
protocol: TCP
volumeMounts:
- mountPath: /var/lib/onlyoffice
name: nextcloud-aio-onlyoffice

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -3,11 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-onlyoffice
name: nextcloud-aio-onlyoffice
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "80"

View File

@@ -2,11 +2,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -15,8 +16,8 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-redis
@@ -37,10 +38,14 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20230626_101439-latest
image: nextcloud/aio-redis:20230720_134150-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379
hostPort: 6379
protocol: TCP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /data
name: nextcloud-aio-redis

View File

@@ -4,6 +4,7 @@ metadata:
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ values.NAMESPACE }}
spec:
{{- if .Values.STORAGE_CLASS }}
storageClassName: {{ .Values.STORAGE_CLASS }}

View File

@@ -2,11 +2,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-redis
name: nextcloud-aio-redis
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "6379"

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,12 +17,34 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-talk
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-talk-tmpfs0
- /nextcloud-aio-talk-tmpfs1
- /nextcloud-aio-talk-tmpfs2
- /nextcloud-aio-talk-tmpfs3
- /nextcloud-aio-talk-tmpfs4
volumeMounts:
- name: nextcloud-aio-talk-tmpfs4
mountPath: /nextcloud-aio-talk-tmpfs4
- name: nextcloud-aio-talk-tmpfs3
mountPath: /nextcloud-aio-talk-tmpfs3
- name: nextcloud-aio-talk-tmpfs2
mountPath: /nextcloud-aio-talk-tmpfs2
- name: nextcloud-aio-talk-tmpfs1
mountPath: /nextcloud-aio-talk-tmpfs1
- name: nextcloud-aio-talk-tmpfs0
mountPath: /nextcloud-aio-talk-tmpfs0
containers:
- env:
- name: INTERNAL_SECRET
@@ -36,11 +59,40 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20230626_101439-latest
image: nextcloud/aio-talk:20230720_134150-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}
hostPort: {{ .Values.TALK_PORT }}
protocol: TCP
- containerPort: {{ .Values.TALK_PORT }}
hostPort: {{ .Values.TALK_PORT }}
protocol: UDP
- containerPort: 8081
hostPort: 8081
protocol: TCP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /var/log/supervisord
name: nextcloud-aio-talk-tmpfs0
- mountPath: /var/run/supervisord
name: nextcloud-aio-talk-tmpfs1
- mountPath: /conf
name: nextcloud-aio-talk-tmpfs2
- mountPath: /var/lib/turn
name: nextcloud-aio-talk-tmpfs3
- mountPath: /tmp
name: nextcloud-aio-talk-tmpfs4
volumes:
- emptyDir: {}
name: nextcloud-aio-talk-tmpfs0
- emptyDir: {}
name: nextcloud-aio-talk-tmpfs1
- emptyDir: {}
name: nextcloud-aio-talk-tmpfs2
- emptyDir: {}
name: nextcloud-aio-talk-tmpfs3
- emptyDir: {}
name: nextcloud-aio-talk-tmpfs4
{{- end }}

View File

@@ -3,11 +3,12 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-talk-recording
name: nextcloud-aio-talk-recording
namespace: {{ values.NAMESPACE }}
spec:
replicas: 1
selector:
@@ -16,12 +17,25 @@ spec:
template:
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.network/nextcloud-aio: "true"
io.kompose.service: nextcloud-aio-talk-recording
spec:
initContainers:
- name: init-volumes
image: alpine
command:
- chmod
- "777"
- /nextcloud-aio-talk-recording-tmpfs0
- /nextcloud-aio-talk-recording-tmpfs1
volumeMounts:
- name: nextcloud-aio-talk-recording-tmpfs1
mountPath: /nextcloud-aio-talk-recording-tmpfs1
- name: nextcloud-aio-talk-recording-tmpfs0
mountPath: /nextcloud-aio-talk-recording-tmpfs0
containers:
- env:
- name: INTERNAL_SECRET
@@ -32,8 +46,22 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk-recording:20230626_101439-latest
image: nextcloud/aio-talk-recording:20230720_134150-latest
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234
hostPort: 1234
protocol: TCP
securityContext:
readOnlyRootFilesystem: true
volumeMounts:
- mountPath: /tmp
name: nextcloud-aio-talk-recording-tmpfs0
- mountPath: /conf
name: nextcloud-aio-talk-recording-tmpfs1
volumes:
- emptyDir: {}
name: nextcloud-aio-talk-recording-tmpfs0
- emptyDir: {}
name: nextcloud-aio-talk-recording-tmpfs1
{{- end }}

View File

@@ -3,11 +3,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-talk-recording
name: nextcloud-aio-talk-recording
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "1234"

View File

@@ -4,11 +4,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk-public
namespace: {{ values.NAMESPACE }}
spec:
type: LoadBalancer
ports:
@@ -26,11 +27,12 @@ apiVersion: v1
kind: Service
metadata:
annotations:
kompose.cmd: kompose convert -c -f latest.yml
kompose.version: 1.28.0 (c4137012e)
kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }}
kompose.version: 1.30.0 (9d8dcb518)
labels:
io.kompose.service: nextcloud-aio-talk
name: nextcloud-aio-talk
namespace: {{ values.NAMESPACE }}
spec:
ports:
- name: "8081"

View File

@@ -15,6 +15,9 @@ curl -L https://github.com/kubernetes/kompose/releases/download/"$LATEST_KOMPOSE
chmod +x kompose
sudo mv ./kompose /usr/local/bin/kompose
# Install yq
snap install yq
set -ex
# Conversion of docker-compose
@@ -39,11 +42,14 @@ sed -i "/^volumes:/a\ \ nextcloud_aio_nextcloud_trusted_cacerts:\n \ \ \ \ name:
sed -i "s|\${NEXTCLOUD_TRUSTED_CACERTS_DIR}:|nextcloud_aio_nextcloud_trusted_cacerts:|g#" latest.yml
sed -i 's|\${|{{ .Values.|g' latest.yml
sed -i 's|}| }}|g' latest.yml
yq -i 'del(.services.[].profiles)' latest.yml
cat latest.yml
kompose convert -c -f latest.yml
kompose convert -c -f latest.yml --namespace nextcloud-aio-namespace
cd latest
mv ./templates/manual-install-nextcloud-aio-networkpolicy.yaml ./templates/nextcloud-aio-networkpolicy.yaml
if [ -f ./templates/manual-install-nextcloud-aio-networkpolicy.yaml ]; then
mv ./templates/manual-install-nextcloud-aio-networkpolicy.yaml ./templates/nextcloud-aio-networkpolicy.yaml
fi
# shellcheck disable=SC1083
find ./ -name '*networkpolicy.yaml' -exec sed -i "s|manual-install-nextcloud-aio|nextcloud-aio|" \{} \;
cat << EOL > /tmp/initcontainers
@@ -109,6 +115,8 @@ for variable in "${DEPLOYMENTS[@]}"; do
fi
done
# shellcheck disable=SC1083
find ./ -name '*.yaml' -exec sed -i "s|nextcloud-aio-namespace|\{\{ values.NAMESPACE \}\}|" \{} \;
# shellcheck disable=SC1083
find ./ -name '*service.yaml' -exec sed -i "/^status:/,$ d" \{} \;
# shellcheck disable=SC1083
find ./ -name '*deployment.yaml' -exec sed -i "s|manual-install-nextcloud-aio|nextcloud-aio|" \{} \;
@@ -197,6 +205,9 @@ sed -i '/_ENABLED.*/s/ yes / "yes" /' /tmp/sample.conf
sed -i '/_ENABLED.*/s/ no / "no" /' /tmp/sample.conf
sed -i 's|^NEXTCLOUD_TRUSTED_CACERTS_DIR: .*|NEXTCLOUD_TRUSTED_CACERTS_DIR: # Setting this to any value allows to automatically import root certificates into the Nextcloud container|' /tmp/sample.conf
sed -i 's|10737418240|"10737418240"|' /tmp/sample.conf
# shellcheck disable=SC2129
echo "NAMESPACE: default # By changing this, you can adjust the namespace of the installation which allows to install multiple instances on one kubernetes cluster" >> /tmp/sample.conf
# shellcheck disable=SC2129
echo "" >> /tmp/sample.conf
# shellcheck disable=SC2129
echo 'STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes' >> /tmp/sample.conf

View File

@@ -31,6 +31,7 @@ NEXTCLOUD_TRUSTED_CACERTS_DIR: # Setting this to any value allows to auto
NEXTCLOUD_UPLOAD_LIMIT: 10G # This allows to change the upload limit of the Nextcloud container
TALK_PORT: 3478 # This allows to adjust the port that the talk container is using.
UPDATE_NEXTCLOUD_APPS: no # When setting to yes (with quotes), it will automatically update all installed Nextcloud apps upon container startup on saturdays.
NAMESPACE: default # By changing this, you can adjust the namespace of the installation which allows to install multiple instances on one kubernetes cluster
STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes
APACHE_STORAGE_SIZE: 1Gi # You can change the size of the apache volume that default to 1Gi with this value

View File

@@ -209,6 +209,9 @@
],
"networks": [
"nextcloud-aio"
],
"tmpfs": [
"/tmp"
]
},
{
@@ -472,6 +475,7 @@
"protocol": "tcp"
}
],
"internal_port": "%APACHE_PORT%",
"environment": [
"INSTANCE_ID=%INSTANCE_ID%",
"APACHE_PORT=%APACHE_PORT%"
@@ -587,9 +591,14 @@
"internal_port": "9200",
"environment": [
"TZ=%TIMEZONE%",
"ES_JAVA_OPTS=-Xms512M -Xmx512M",
"bootstrap.memory_lock=true",
"cluster.name=nextcloud-aio",
"discovery.type=single-node",
"ES_JAVA_OPTS=-Xms1024M -Xmx1024M",
"POSTGRES_HOST=nextcloud-aio-database"
"logger.org.elasticsearch.discovery=WARN",
"http.port=9200",
"xpack.license.self_generated.type=basic",
"xpack.security.enabled=false"
],
"volumes": [
{

View File

@@ -176,6 +176,6 @@ $app->get('/', function (\Psr\Http\Message\RequestInterface $request, Response $
}
});
$errorMiddleware = $app->addErrorMiddleware(true, true, true);
$errorMiddleware = $app->addErrorMiddleware(false, true, true);
$app->run();

View File

@@ -255,7 +255,11 @@ class DockerController
}
$this->StopDomaincheckContainer();
$this->PerformRecursiveContainerStart($id);
try {
$this->PerformRecursiveContainerStart($id);
} catch (\Exception $e) {
error_log('Could not start domaincheck container: ' . $e->getMessage());
}
// Cache the start for 10 minutes
apcu_add($cacheKey, '1', 600);

View File

@@ -211,9 +211,16 @@ class DockerActionManager
public function CreateContainer(Container $container) : void {
$volumes = [];
foreach($container->GetVolumes()->GetVolumes() as $volume) {
foreach ($container->GetVolumes()->GetVolumes() as $volume) {
// NEXTCLOUD_MOUNT gets added via bind-mount later on
if ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') {
if ($volume->name === $this->configurationManager->GetNextcloudMount()) {
continue;
}
}
$volumeEntry = $volume->name . ':' . $volume->mountPoint;
if($volume->isWritable) {
if ($volume->isWritable) {
$volumeEntry = $volumeEntry . ':' . 'rw';
} else {
$volumeEntry = $volumeEntry . ':' . 'ro';
@@ -226,7 +233,7 @@ class DockerActionManager
'Image' => $this->BuildImageName($container),
];
if(count($volumes) > 0) {
if (count($volumes) > 0) {
$requestBody['HostConfig']['Binds'] = $volumes;
}
@@ -447,10 +454,11 @@ class DockerActionManager
$requestBody['HostConfig']['SecurityOpt'] = ["apparmor:unconfined"];
}
$mounts = [];
// Special things for the backup container which should not be exposed in the containers.json
if ($container->GetIdentifier() === 'nextcloud-aio-borgbackup') {
// Additional backup directories
$mounts = [];
foreach ($this->getAllBackupVolumes() as $additionalBackupVolumes) {
if ($additionalBackupVolumes !== '') {
$mounts[] = ["Type" => "volume", "Source" => $additionalBackupVolumes, "Target" => "/nextcloud_aio_volumes/" . $additionalBackupVolumes, "ReadOnly" => false];
@@ -465,13 +473,22 @@ class DockerActionManager
}
}
}
if(count($mounts) > 0) {
$requestBody['HostConfig']['Mounts'] = $mounts;
}
// Special things for the talk container which should not be exposed in the containers.json
} elseif ($container->GetIdentifier() === 'nextcloud-aio-talk') {
// This is needed due to a bug in libwebsockets which cannot handle unlimited ulimits
$requestBody['HostConfig']['Ulimits'] = [["Name" => "nofile", "Hard" => 200000, "Soft" => 200000]];
// Special things for the nextcloud container which should not be exposed in the containers.json
} elseif ($container->GetIdentifier() === 'nextcloud-aio-nextcloud') {
foreach ($container->GetVolumes()->GetVolumes() as $volume) {
if ($volume->name !== $this->configurationManager->GetNextcloudMount()) {
continue;
}
$mounts[] = ["Type" => "bind", "Source" => $volume->name, "Target" => $volume->mountPoint, "ReadOnly" => !$volume->isWritable, "BindOptions" => [ "Propagation" => "rshared"]];
}
}
if (count($mounts) > 0) {
$requestBody['HostConfig']['Mounts'] = $mounts;
}
$url = $this->BuildApiUrl('containers/create?name=' . $container->GetIdentifier());

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v6.3.0</h1>
<h1>Nextcloud AIO v6.4.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -24,6 +24,7 @@
{% set isAnyRunning = false %}
{% set isAnyRestarting = false %}
{% set isWatchtowerRunning = false %}
{% set isDomaincheckRunning = false %}
{% set isBackupOrRestoreRunning = false %}
{% set isApacheStarting = false %}
{# Setting newMajorVersion to '' will hide corresponding options/elements, can be set to an integer like 26 in order to show corresponding elements. If set, also increase installLatestMajor in https://github.com/nextcloud/all-in-one/blob/main/php/src/Controller/DockerController.php #}
@@ -45,6 +46,9 @@
{% if container.GetIdentifier() == 'nextcloud-aio-watchtower' and class(container.GetRunningState()) == 'AIO\\Container\\State\\RunningState' %}
{% set isWatchtowerRunning = true %}
{% endif %}
{% if container.GetIdentifier() == 'nextcloud-aio-domaincheck' and class(container.GetRunningState()) == 'AIO\\Container\\State\\RunningState' %}
{% set isDomaincheckRunning = true %}
{% endif %}
{% if container.GetIdentifier() == 'nextcloud-aio-apache' and class(container.GetStartingState()) == 'AIO\\Container\\State\\StartingState' %}
{% set isApacheStarting = true %}
{% endif %}
@@ -69,7 +73,10 @@
<a href="" class="button reload">Reload ↻</a><br/>
{% else %}
{% if is_backup_container_running == false and domain == "" %}
{% if is_mastercontainer_update_available == true %}
{% if isDomaincheckRunning == false %}
<h2>Domaincheck container is not running</h2>
This is not expected. Most likely this happened because port {{ apache_port }} is already in use on your server. You can check the mastercontainer logs and domaincheck container logs for further clues. You should be able to resolve this by adjusting the APACHE_PORT by following the <b><a href="https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md">reverse proxy documentation</a></b>. Advice: have a detailed look at the changed docker run command for AIO.
{% elseif is_mastercontainer_update_available == true %}
<h2>Mastercontainer update</h2>
⚠️ A mastercontainer update is available. Please click on the button below to update it. Afterwards, you will be able to proceed with the setup.<br><br>
<form method="POST" action="/api/docker/watchtower" class="xhr">