Compare commits

...

47 Commits

Author SHA1 Message Date
Simon L
2ff1913f2c increase to 7.2.0
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-13 13:20:58 +02:00
Simon L
e98d8a2304 Merge pull request #3309 from nextcloud/enh/noid/rename-app-ecosystem 2023-09-12 11:25:18 +02:00
Simon L
b7c7720244 adjust links
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-12 11:23:16 +02:00
Simon L
5d9c6705c4 rename to app api
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-12 11:23:16 +02:00
Simon L
170cb93806 rename app_ecosystem_v2 to app_api
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-12 11:23:16 +02:00
Simon L
04fbbecad6 Merge pull request #3334 from nextcloud/enh/noid/revert-tmpfs-for-nextcloud 2023-09-12 11:22:33 +02:00
Simon L
2635fee3fd Revert "nextcloud container - make /tmp a tmpfs"
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-12 11:20:30 +02:00
Simon L
8b0b0d0ad8 Merge pull request #3317 from nextcloud/enh/noid/limit-mastercontainer-to-localhost 2023-09-12 11:05:39 +02:00
Simon L
99df9a32b5 Merge pull request #3313 from nextcloud/enh/noid/head-request 2023-09-12 11:03:38 +02:00
Simon L
9537122b78 Merge pull request #2986 from nextcloud/enh/2985/allow-to-keep-disabled-apps 2023-09-12 11:03:26 +02:00
Simon L
371685cfd5 Merge pull request #3308 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-24.0.6-cli 2023-09-12 10:59:22 +02:00
dependabot[bot]
3431255f45 Bump docker from 24.0.5-cli to 24.0.6-cli in /Containers/mastercontainer
Bumps docker from 24.0.5-cli to 24.0.6-cli.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-12 08:58:12 +00:00
Simon L
cc7c0e0c6c Merge pull request #3326 from nextcloud/nextcloud-container-update 2023-09-12 10:58:04 +02:00
Simon L
55dc9f4d7f Merge pull request #3323 from nextcloud/dependabot/docker/Containers/docker-socket-proxy/haproxy-2.8.3-alpine3.18 2023-09-12 10:57:51 +02:00
Simon L
af3cf47637 Merge pull request #3322 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.9.2 2023-09-12 10:57:37 +02:00
Simon L
21cd49f933 Merge pull request #3321 from nextcloud/dependabot/docker/Containers/redis/redis-7.2.1-alpine 2023-09-12 10:57:22 +02:00
Simon L
d2d746f628 Merge pull request #3320 from nextcloud/aio-dependency-update 2023-09-12 10:57:02 +02:00
Simon L
7904979be9 Merge pull request #3316 from nextcloud/dependabot/docker/Containers/talk/nats-2.9.22-scratch 2023-09-12 10:56:44 +02:00
Simon L
6683473854 Merge pull request #3315 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.21.1-alpine3.18 2023-09-12 10:56:31 +02:00
dependabot[bot]
f2354d0b70 Bump redis from 7.0.12-alpine to 7.2.1-alpine in /Containers/redis
Bumps redis from 7.0.12-alpine to 7.2.1-alpine.

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-12 08:54:50 +00:00
dependabot[bot]
5c66b783f4 Bump elasticsearch from 8.9.1 to 8.9.2 in /Containers/fulltextsearch
Bumps elasticsearch from 8.9.1 to 8.9.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-12 08:54:27 +00:00
Simon L
f23cce39f8 Merge pull request #3333 from nextcloud/aio-helm-update 2023-09-12 10:54:16 +02:00
szaimen
220e562e03 Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-09-12 08:46:20 +00:00
Simon L
9a6a8b50ef Merge pull request #3184 from nextcloud/aio-yaml-update 2023-09-12 10:42:56 +02:00
szaimen
74b04e9484 nextcloud-update automated change
Signed-off-by: GitHub <noreply@github.com>
2023-09-11 12:08:06 +00:00
szaimen
dfe1ac9013 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-09-11 12:02:32 +00:00
szaimen
f37c435526 php dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-09-11 12:02:12 +00:00
Simon L
c1cedac15c rename nextcloud update to nextcloud dependency update
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-11 10:30:47 +02:00
dependabot[bot]
103077590f Bump haproxy in /Containers/docker-socket-proxy
Bumps haproxy from 2.8.2-alpine3.18 to 2.8.3-alpine3.18.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-08 12:56:16 +00:00
Simon L
64d698359c mastercontainer - limit access to php-fpm to localhost
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-07 16:52:37 +02:00
Simon L
2e0410a704 allow to keep disabled apps
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-07 15:59:33 +02:00
dependabot[bot]
04c442d8c1 Bump nats from 2.9.21-scratch to 2.9.22-scratch in /Containers/talk
Bumps nats from 2.9.21-scratch to 2.9.22-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-09-07 12:39:17 +00:00
dependabot[bot]
a45dc5aed7 Bump golang in /Containers/imaginary
Bumps golang from 1.21.0-alpine3.18 to 1.21.1-alpine3.18.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-07 12:29:01 +00:00
Simon L
96e22fbc31 Update check - move to head request instead of get request
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-07 14:12:43 +02:00
Simon L
faf1e4b2a9 increase to 7.1.1
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-05 12:11:49 +02:00
Simon L
a0dddcc1b3 Merge pull request #3298 from nextcloud/enh/noid/fix-timezone-exit 2023-09-05 12:10:51 +02:00
Simon L
4f7fdf55d3 Merge pull request #3302 from nextcloud/dependabot/github_actions/actions/checkout-4 2023-09-04 16:11:28 +02:00
Simon L
016b014244 Merge pull request #3301 from nextcloud/dependabot/docker/Containers/mastercontainer/php-8.2.10-fpm-alpine3.18 2023-09-04 16:10:57 +02:00
Simon L
d6933ed55a Merge pull request #3300 from nextcloud/dependabot/docker/Containers/nextcloud/php-8.1.23-fpm-alpine3.18 2023-09-04 16:10:43 +02:00
dependabot[bot]
9c4917165e Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 12:29:01 +00:00
dependabot[bot]
0c4c1a88f3 Bump php in /Containers/mastercontainer
Bumps php from 8.2.9-fpm-alpine3.18 to 8.2.10-fpm-alpine3.18.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 12:25:45 +00:00
dependabot[bot]
e49829eb63 Bump php in /Containers/nextcloud
Bumps php from 8.1.22-fpm-alpine3.18 to 8.1.23-fpm-alpine3.18.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 12:24:36 +00:00
Simon L
af10e28225 Merge pull request #3293 from nextcloud/aio-dependency-update 2023-09-04 11:31:50 +02:00
Simon L
fad6477c2a do not exit if TZ is set
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-09-04 11:20:49 +02:00
Simon L
422b1d4922 Merge pull request #3296 from Imzxhir/patch-1
Fix a small mistake in Traefik Docs
2023-09-04 10:29:25 +02:00
Zxhir
91618de5a7 Fix a small mistake in Traefik Docs
Signed-off-by: Zxhir <98621617+Imzxhir@users.noreply.github.com>
2023-09-03 15:52:10 +01:00
szaimen
3bfa1e5239 php dependency updates
Signed-off-by: GitHub <noreply@github.com>
2023-09-01 12:02:13 +00:00
54 changed files with 139 additions and 87 deletions

View File

@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check spelling
uses: codespell-project/actions-codespell@v2
with:

View File

@@ -31,7 +31,7 @@ jobs:
reaction-type: "+1"
- name: Checkout the latest code
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
uses: actions/checkout@v4 # v3.5.2
with:
fetch-depth: 0
token: ${{ secrets.COMMAND_BOT_PAT }}

View File

@@ -10,7 +10,7 @@ jobs:
name: Run dependency update script
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: 8.2

View File

@@ -25,7 +25,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install npm and dockerfilelint
run: |

View File

@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Turnstyle
uses: softprops/turnstyle@v1

View File

@@ -10,7 +10,7 @@ jobs:
name: update to latest imaginary commit on master branch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run imaginary-update
run: |
# Imaginary

View File

@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Validate Json
run: |
sudo apt-get update

View File

@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

View File

@@ -33,7 +33,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
uses: actions/checkout@v4 # v3.5.2
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2

View File

@@ -11,7 +11,7 @@ jobs:
name: Run nextcloud-update script
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run nextcloud-update script
run: |
# Inspired by https://github.com/nextcloud/docker/blob/master/update.sh
@@ -72,7 +72,7 @@ jobs:
with:
commit-message: nextcloud-update automated change
signoff: true
title: Nextcloud update
title: Nextcloud dependency update
body: Automated Nextcloud container update
labels: dependencies, 3. to review
milestone: next

View File

@@ -16,7 +16,7 @@ jobs:
name: PHP Deprecation Detector
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up php8.2
uses: shivammathur/setup-php@v2
with:

View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up php8.2
uses: shivammathur/setup-php@v2

View File

@@ -26,7 +26,7 @@ jobs:
name: Nextcloud
steps:
- name: Checkout
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
uses: actions/checkout@v4 # v3.5.2
- name: Set up php
uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2

View File

@@ -15,7 +15,7 @@ jobs:
name: Check Shell
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run Shellcheck
uses: ludeeus/action-shellcheck@2.0.0
with:

View File

@@ -10,7 +10,7 @@ jobs:
name: update talk
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run talk-update
run: |
# Spreed

View File

@@ -24,7 +24,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2

View File

@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: update helm chart
run: |
DOCKER_TAG="$(curl -L -s 'https://registry.hub.docker.com/v2/repositories/nextcloud/all-in-one/tags?page_size=1024' | jq '."results"[]["name"]' | sed 's|"||g' | grep '^20' | sort -r | head -1)"

View File

@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: update yaml files
run: |
sudo bash manual-install/update-yaml.sh

View File

@@ -1,4 +1,4 @@
FROM haproxy:2.8.2-alpine3.18
FROM haproxy:2.8.3-alpine3.18
USER root
ENV NEXTCLOUD_HOST nextcloud-aio-nextcloud

View File

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

View File

@@ -1,4 +1,4 @@
FROM golang:1.21.0-alpine3.18 as go
FROM golang:1.21.1-alpine3.18 as go
ENV IMAGINARY_HASH b632dae8cc321452c3f85bcae79c580b1ae1ed84

View File

@@ -1,11 +1,11 @@
# Docker CLI is a requirement
FROM docker:24.0.5-cli as docker
FROM docker:24.0.6-cli as docker
# Caddy is a requirement
FROM caddy:2.7.4-alpine as caddy
# From https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile
FROM php:8.2.9-fpm-alpine3.18
FROM php:8.2.10-fpm-alpine3.18
EXPOSE 80
EXPOSE 8080
@@ -56,6 +56,8 @@ RUN set -ex; \
sed -i 's/^pm = dynamic/pm = ondemand/' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's/^pm.max_children =.*/pm.max_children = 80/' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's|access.log = /proc/self/fd/2|access.log = /proc/self/fd/1|' /usr/local/etc/php-fpm.d/docker.conf; \
grep -q ';listen.allowed_clients' /usr/local/etc/php-fpm.d/www.conf; \
sed -i 's|;listen.allowed_clients.*|listen.allowed_clients = 127.0.0.1,::1|' /usr/local/etc/php-fpm.d/www.conf; \
\
apk add --no-cache git; \
wget https://getcomposer.org/installer -O - | php -- --install-dir=/usr/local/bin --filename=composer; \

View File

@@ -253,17 +253,20 @@ if [ "$?" = 6 ]; then
exit 1
fi
# Check that no changes have been made to timezone settings since AIO only supports running in UTC timezone
# Check that no changes have been made to timezone settings since AIO only supports running in Etc/UTC timezone
if [ -n "$TZ" ]; then
print_red "The environmental variable TZ has been set which is not supported by AIO since it only supports running in the default UTC timezone!"
print_red "The environmental variable TZ has been set which is not supported by AIO since it only supports running in the default Etc/UTC timezone!"
echo "The correct timezone can be set in the AIO interface later on!"
# Disable exit since it seems to be by default set on unraid and we dont want to break these instances
# exit 1
fi
if mountpoint -q /etc/localtime; then
print_red "/etc/localtime has been mounted into the container which is not allowed because AIO only supports running in the default Etc/UTC timezone!"
echo "The correct timezone can be set in the AIO interface later on!"
exit 1
elif mountpoint -q /etc/localtime; then
print_red "/etc/localtime has been mounted into the container which is not allowed because AIO only supports running in the default UTC timezone!"
echo "The correct timezone can be set in the AIO interface later on!"
exit 1
elif mountpoint -q /etc/timezone; then
print_red "/etc/timezone has been mounted into the container which is not allowed because AIO only supports running in the default UTC timezone!"
fi
if mountpoint -q /etc/timezone; then
print_red "/etc/timezone has been mounted into the container which is not allowed because AIO only supports running in the default Etc/UTC timezone!"
echo "The correct timezone can be set in the AIO interface later on!"
exit 1
fi

View File

@@ -1,4 +1,4 @@
FROM php:8.1.22-fpm-alpine3.18
FROM php:8.1.23-fpm-alpine3.18
ENV PHP_MEMORY_LIMIT 512M
ENV PHP_UPLOAD_LIMIT 10G
@@ -69,7 +69,7 @@ RUN set -ex; \
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.22; \
pecl install memcached-3.2.0; \
pecl install redis-5.3.7; \
pecl install redis-6.0.0; \
pecl install imagick-3.7.0; \
\
docker-php-ext-enable \

View File

@@ -562,7 +562,7 @@ if [ "$COLLABORA_ENABLED" = 'yes' ]; then
echo "Warning: wopi_allowlist is empty which should not be the case!"
fi
else
if [ -d "/var/www/html/custom_apps/richdocuments" ]; then
if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/richdocuments" ]; then
php /var/www/html/occ app:remove richdocuments
fi
fi
@@ -586,7 +586,7 @@ if [ "$ONLYOFFICE_ENABLED" = 'yes' ]; then
php /var/www/html/occ config:app:set onlyoffice DocumentServerUrl --value="https://$NC_DOMAIN/onlyoffice"
php /var/www/html/occ config:system:set allow_local_remote_servers --type=bool --value=true
else
if [ -d "/var/www/html/custom_apps/onlyoffice" ] && [ -n "$ONLYOFFICE_SECRET" ] && [ "$(php /var/www/html/occ config:system:get onlyoffice jwt_secret)" = "$ONLYOFFICE_SECRET" ]; then
if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/onlyoffice" ] && [ -n "$ONLYOFFICE_SECRET" ] && [ "$(php /var/www/html/occ config:system:get onlyoffice jwt_secret)" = "$ONLYOFFICE_SECRET" ]; then
php /var/www/html/occ app:remove onlyoffice
fi
fi
@@ -613,7 +613,7 @@ if [ "$TALK_ENABLED" = 'yes' ]; then
php /var/www/html/occ talk:signaling:add "https://$NC_DOMAIN/standalone-signaling/" "$SIGNALING_SECRET" --verify
fi
else
if [ -d "/var/www/html/custom_apps/spreed" ]; then
if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/spreed" ]; then
php /var/www/html/occ app:remove spreed
fi
fi
@@ -660,7 +660,7 @@ if [ "$CLAMAV_ENABLED" = 'yes' ]; then
php /var/www/html/occ config:app:set files_antivirus av_infected_action --value="only_log"
fi
else
if [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
php /var/www/html/occ app:remove files_antivirus
fi
fi
@@ -723,30 +723,32 @@ if [ "$FULLTEXTSEARCH_ENABLED" = 'yes' ]; then
fi
fi
else
if [ -d "/var/www/html/custom_apps/fulltextsearch" ]; then
php /var/www/html/occ app:remove fulltextsearch
fi
if [ -d "/var/www/html/custom_apps/fulltextsearch_elasticsearch" ]; then
php /var/www/html/occ app:remove fulltextsearch_elasticsearch
fi
if [ -d "/var/www/html/custom_apps/files_fulltextsearch" ]; then
php /var/www/html/occ app:remove files_fulltextsearch
if [ "$REMOVE_DISABLED_APPS" = yes ]; then
if [ -d "/var/www/html/custom_apps/fulltextsearch" ]; then
php /var/www/html/occ app:remove fulltextsearch
fi
if [ -d "/var/www/html/custom_apps/fulltextsearch_elasticsearch" ]; then
php /var/www/html/occ app:remove fulltextsearch_elasticsearch
fi
if [ -d "/var/www/html/custom_apps/files_fulltextsearch" ]; then
php /var/www/html/occ app:remove files_fulltextsearch
fi
fi
fi
# Docker socket proxy
if version_greater "$installed_version" "27.1.0.0"; then
if [ "$DOCKER_SOCKET_PROXY_ENABLED" = 'yes' ]; then
if ! [ -d "/var/www/html/custom_apps/app_ecosystem_v2" ]; then
php /var/www/html/occ app:install app_ecosystem_v2
elif [ "$(php /var/www/html/occ config:app:get app_ecosystem_v2 enabled)" != "yes" ]; then
php /var/www/html/occ app:enable app_ecosystem_v2
if ! [ -d "/var/www/html/custom_apps/app_api" ]; then
php /var/www/html/occ app:install app_api
elif [ "$(php /var/www/html/occ config:app:get app_api enabled)" != "yes" ]; then
php /var/www/html/occ app:enable app_api
elif [ "$SKIP_UPDATE" != 1 ]; then
php /var/www/html/occ app:update app_ecosystem_v2
php /var/www/html/occ app:update app_api
fi
else
if [ -d "/var/www/html/custom_apps/app_ecosystem_v2" ]; then
php /var/www/html/occ app:remove app_ecosystem_v2
if [ "$REMOVE_DISABLED_APPS" = yes ] && [ -d "/var/www/html/custom_apps/app_api" ]; then
php /var/www/html/occ app:remove app_api
fi
fi
fi

View File

@@ -1,5 +1,5 @@
# From https://github.com/docker-library/redis/blob/master/7.0/alpine/Dockerfile
FROM redis:7.0.12-alpine
FROM redis:7.2.1-alpine
COPY --chmod=775 start.sh /start.sh

View File

@@ -1,4 +1,4 @@
FROM nats:2.9.21-scratch as nats
FROM nats:2.9.22-scratch as nats
FROM eturnal/eturnal:1.11.1 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:1.1.3 as signaling
FROM alpine:3.18.3 as janus

View File

@@ -27,6 +27,7 @@ services:
# - NEXTCLOUD_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-os-packages-permanently-to-the-nextcloud-container
# - NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-php-extensions-permanently-to-the-nextcloud-container
# - NEXTCLOUD_ENABLE_DRI_DEVICE=true # This allows to enable the /dev/dri device in the Nextcloud container. ⚠️⚠️⚠️ Warning: this only works if the '/dev/dri' device is present on the host! If it should not exist on your host, don't set this to true as otherwise the Nextcloud container will fail to start! See https://github.com/nextcloud/all-in-one#how-to-enable-hardware-transcoding-for-nextcloud
# - NEXTCLOUD_KEEP_DISABLED_APPS=false # Setting this to true will keep Nextcloud apps that are disabled in the AIO interface and not uninstall them if they should be installed. See https://github.com/nextcloud/all-in-one#how-to-keep-disabled-apps
# - TALK_PORT=3478 # This allows to adjust the port that the talk container is using. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-talk-port
# - WATCHTOWER_DOCKER_SOCKET_PATH=/var/run/docker.sock # Needs to be specified if the docker socket on the host is not located in the default '/var/run/docker.sock'. Otherwise mastercontainer updates will fail. For macos it needs to be '/var/run/docker.sock'
# networks: # Is needed when you want to create the nextcloud-aio network with ipv6-support using this file, see the network config at the bottom of the file

View File

@@ -17,6 +17,7 @@ services:
condition: service_started
required: false
image: nextcloud/aio-apache:latest
init: true
ports:
- ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/tcp
- ${APACHE_IP_BINDING}:${APACHE_PORT}:${APACHE_PORT}/udp
@@ -47,6 +48,7 @@ services:
nextcloud-aio-database:
image: nextcloud/aio-postgresql:latest
init: true
expose:
- "5432"
volumes:
@@ -88,6 +90,7 @@ services:
condition: service_started
required: false
image: nextcloud/aio-nextcloud:latest
init: true
expose:
- "9000"
volumes:
@@ -137,6 +140,7 @@ services:
- TALK_RECORDING_ENABLED=${TALK_RECORDING_ENABLED}
- RECORDING_SECRET=${RECORDING_SECRET}
- TALK_RECORDING_HOST=nextcloud-aio-talk-recording
- FULLTEXTSEARCH_PASSWORD=${FULLTEXTSEARCH_PASSWORD}
restart: unless-stopped
networks:
- nextcloud-aio
@@ -145,6 +149,7 @@ services:
nextcloud-aio-notify-push:
image: nextcloud/aio-notify-push:latest
init: true
expose:
- "7867"
volumes:
@@ -165,6 +170,7 @@ services:
nextcloud-aio-redis:
image: nextcloud/aio-redis:latest
init: true
expose:
- "6379"
environment:
@@ -179,6 +185,7 @@ services:
nextcloud-aio-collabora:
image: nextcloud/aio-collabora:latest
init: true
expose:
- "9980"
environment:
@@ -196,6 +203,7 @@ services:
nextcloud-aio-talk:
image: nextcloud/aio-talk:latest
init: true
ports:
- ${TALK_PORT}:${TALK_PORT}/tcp
- ${TALK_PORT}:${TALK_PORT}/udp
@@ -218,12 +226,13 @@ services:
tmpfs:
- /var/log/supervisord
- /var/run/supervisord
- /opt/eturnal/run
- /conf
- /var/lib/turn
- /tmp
nextcloud-aio-talk-recording:
image: nextcloud/aio-talk-recording:latest
init: true
expose:
- "1234"
environment:
@@ -244,6 +253,7 @@ services:
nextcloud-aio-clamav:
image: nextcloud/aio-clamav:latest
init: true
expose:
- "3310"
environment:
@@ -264,6 +274,7 @@ services:
nextcloud-aio-onlyoffice:
image: nextcloud/aio-onlyoffice:latest
init: true
expose:
- "80"
environment:
@@ -281,6 +292,7 @@ services:
nextcloud-aio-imaginary:
image: nextcloud/aio-imaginary:latest
init: true
expose:
- "9000"
environment:
@@ -298,6 +310,7 @@ services:
nextcloud-aio-fulltextsearch:
image: nextcloud/aio-fulltextsearch:latest
init: false
expose:
- "9200"
environment:
@@ -310,6 +323,7 @@ services:
- http.port=9200
- xpack.license.self_generated.type=basic
- xpack.security.enabled=false
- FULLTEXTSEARCH_PASSWORD=${FULLTEXTSEARCH_PASSWORD}
volumes:
- nextcloud_aio_elasticsearch:/usr/share/elasticsearch/data:rw
restart: unless-stopped

View File

@@ -1,4 +1,5 @@
DATABASE_PASSWORD= # TODO! This needs to be a unique and good password!
FULLTEXTSEARCH_PASSWORD= # TODO! This needs to be a unique and good password!
NC_DOMAIN=yourdomain.com # TODO! Needs to be changed to the domain that you want to use for Nextcloud.
NEXTCLOUD_PASSWORD= # TODO! This is the password of the initially created Nextcloud admin with username "admin".
ONLYOFFICE_SECRET= # TODO! This needs to be a unique and good password!

View File

@@ -90,6 +90,7 @@ sed -i 's|NEXTCLOUD_STARTUP_APPS=|NEXTCLOUD_STARTUP_APPS="deck twofactor_totp ta
sed -i 's|NEXTCLOUD_ADDITIONAL_APKS=|NEXTCLOUD_ADDITIONAL_APKS=imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value.|' sample.conf
sed -i 's|NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=|NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick # This allows to add additional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value.|' sample.conf
sed -i 's|INSTALL_LATEST_MAJOR=|INSTALL_LATEST_MAJOR=no # Setting this to yes will install the latest Major Nextcloud version upon the first installation|' sample.conf
sed -i 's|REMOVE_DISABLED_APPS=|REMOVE_DISABLED_APPS=yes # Setting this to no keep Nextcloud apps that are disabled via their switch and not uninstall them if they should be installed in Nextcloud.|' sample.conf
sed -i 's|=$|= # TODO! This needs to be a unique and good password!|' sample.conf
echo 'IPV6_NETWORK=fd12:3456:789a:2::/64 # IPv6 subnet to use' >> sample.conf

View File

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

View File

@@ -72,7 +72,7 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:20230817_065941-latest
image: nextcloud/aio-apache:20230912_084059-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View File

@@ -48,7 +48,7 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20230817_065941-latest
image: nextcloud/aio-clamav:20230912_084059-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310

View File

@@ -37,7 +37,7 @@ 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:20230817_065941-latest
image: nextcloud/aio-collabora:20230912_084059-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980

View File

@@ -67,7 +67,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20230817_065941-latest
image: nextcloud/aio-postgresql:20230912_084059-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432

View File

@@ -37,6 +37,8 @@ spec:
- env:
- name: ES_JAVA_OPTS
value: -Xms512M -Xmx512M
- name: FULLTEXTSEARCH_PASSWORD
value: "{{ .Values.FULLTEXTSEARCH_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
- name: bootstrap.memory_lock
@@ -53,7 +55,7 @@ spec:
value: basic
- name: xpack.security.enabled
value: "false"
image: nextcloud/aio-fulltextsearch:20230817_065941-latest
image: nextcloud/aio-fulltextsearch:20230912_084059-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View File

@@ -37,7 +37,7 @@ spec:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20230817_065941-latest
image: nextcloud/aio-imaginary:20230912_084059-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000

View File

@@ -60,6 +60,8 @@ spec:
value: "{{ .Values.FULLTEXTSEARCH_ENABLED }}"
- name: FULLTEXTSEARCH_HOST
value: nextcloud-aio-fulltextsearch
- name: FULLTEXTSEARCH_PASSWORD
value: "{{ .Values.FULLTEXTSEARCH_PASSWORD }}"
- name: IMAGINARY_ENABLED
value: "{{ .Values.IMAGINARY_ENABLED }}"
- name: IMAGINARY_HOST
@@ -120,7 +122,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:20230817_065941-latest
image: nextcloud/aio-nextcloud:20230912_084059-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000

View File

@@ -50,7 +50,7 @@ spec:
value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}"
image: nextcloud/aio-notify-push:20230817_065941-latest
image: nextcloud/aio-notify-push:20230912_084059-latest
name: nextcloud-aio-notify-push
ports:
- containerPort: 7867

View File

@@ -43,7 +43,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20230817_065941-latest
image: nextcloud/aio-onlyoffice:20230912_084059-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View File

@@ -38,7 +38,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20230817_065941-latest
image: nextcloud/aio-redis:20230912_084059-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View File

@@ -59,7 +59,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20230817_065941-latest
image: nextcloud/aio-talk:20230912_084059-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}
@@ -78,9 +78,9 @@ spec:
name: nextcloud-aio-talk-tmpfs0
- mountPath: /var/run/supervisord
name: nextcloud-aio-talk-tmpfs1
- mountPath: /conf
- mountPath: /opt/eturnal/run
name: nextcloud-aio-talk-tmpfs2
- mountPath: /var/lib/turn
- mountPath: /conf
name: nextcloud-aio-talk-tmpfs3
- mountPath: /tmp
name: nextcloud-aio-talk-tmpfs4

View File

@@ -46,7 +46,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk-recording:20230817_065941-latest
image: nextcloud/aio-talk-recording:20230912_084059-latest
name: nextcloud-aio-talk-recording
ports:
- containerPort: 1234

View File

@@ -1,4 +1,5 @@
DATABASE_PASSWORD: # TODO! This needs to be a unique and good password!
FULLTEXTSEARCH_PASSWORD: # TODO! This needs to be a unique and good password!
NC_DOMAIN: yourdomain.com # TODO! Needs to be changed to the domain that you want to use for Nextcloud.
NEXTCLOUD_PASSWORD: # TODO! This is the password of the initially created Nextcloud admin with username admin.
ONLYOFFICE_SECRET: # TODO! This needs to be a unique and good password!

14
php/composer.lock generated
View File

@@ -571,16 +571,16 @@
},
{
"name": "php-di/invoker",
"version": "2.3.3",
"version": "2.3.4",
"source": {
"type": "git",
"url": "https://github.com/PHP-DI/Invoker.git",
"reference": "cd6d9f267d1a3474bdddf1be1da079f01b942786"
"reference": "33234b32dafa8eb69202f950a1fc92055ed76a86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/cd6d9f267d1a3474bdddf1be1da079f01b942786",
"reference": "cd6d9f267d1a3474bdddf1be1da079f01b942786",
"url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86",
"reference": "33234b32dafa8eb69202f950a1fc92055ed76a86",
"shasum": ""
},
"require": {
@@ -614,7 +614,7 @@
],
"support": {
"issues": "https://github.com/PHP-DI/Invoker/issues",
"source": "https://github.com/PHP-DI/Invoker/tree/2.3.3"
"source": "https://github.com/PHP-DI/Invoker/tree/2.3.4"
},
"funding": [
{
@@ -622,7 +622,7 @@
"type": "github"
}
],
"time": "2021-12-13T09:22:56+00:00"
"time": "2023-09-08T09:24:21+00:00"
},
{
"name": "php-di/php-di",
@@ -1793,5 +1793,5 @@
"ext-apcu": "*"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}

View File

@@ -205,7 +205,8 @@
"RECORDING_SECRET=%RECORDING_SECRET%",
"TALK_RECORDING_HOST=nextcloud-aio-talk-recording",
"FULLTEXTSEARCH_PASSWORD=%FULLTEXTSEARCH_PASSWORD%",
"DOCKER_SOCKET_PROXY_ENABLED=%DOCKER_SOCKET_PROXY_ENABLED%"
"DOCKER_SOCKET_PROXY_ENABLED=%DOCKER_SOCKET_PROXY_ENABLED%",
"REMOVE_DISABLED_APPS=%REMOVE_DISABLED_APPS%"
],
"restart": "unless-stopped",
"devices": [
@@ -216,9 +217,6 @@
],
"networks": [
"nextcloud-aio"
],
"tmpfs": [
"/tmp:exec"
]
},
{

View File

@@ -888,4 +888,19 @@ class ConfigurationManager
return false;
}
}
private function GetKeepDisabledApps() : string {
$envVariableName = 'NEXTCLOUD_KEEP_DISABLED_APPS';
$configName = 'nextcloud_keep_disabled_apps';
$defaultValue = '';
return $this->GetEnvironmentalVariableOrConfig($envVariableName, $configName, $defaultValue);
}
public function shouldDisabledAppsGetRemoved() : bool {
if ($this->GetKeepDisabledApps() === 'true') {
return false;
} else {
return true;
}
}
}

View File

@@ -386,6 +386,12 @@ class DockerActionManager
} else {
$replacements[1] = '';
}
} elseif ($out[1] === 'REMOVE_DISABLED_APPS') {
if ($this->configurationManager->shouldDisabledAppsGetRemoved()) {
$replacements[1] = 'yes';
} else {
$replacements[1] = '';
}
} else {
$secret = $this->configurationManager->GetSecret($out[1]);
if ($secret === "") {

View File

@@ -35,7 +35,7 @@ class DockerHubManager
if(isset($decodedBody['token'])) {
$authToken = $decodedBody['token'];
$manifestRequest = $this->guzzleClient->request(
'GET',
'HEAD',
'https://registry-1.docker.io/v2/'.$name.'/manifests/' . $tag,
[
'headers' => [

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v7.1.0</h1>
<h1>Nextcloud AIO v7.2.0</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>
@@ -575,9 +575,9 @@
{#<input type="checkbox" id="onlyoffice" name="onlyoffice"><label for="onlyoffice">OnlyOffice</label><br>#}
{% endif %}
{% if is_docker_socket_proxy_enabled == true %}
<input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy" checked="checked"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_ecosystem_v2#nextcloud-application-ecosystem-v2">Nextcloud Application Ecosystem V2</a>)</label><br><br>
<input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy" checked="checked"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_api#nextcloud-appapi">Nextcloud App API</a>)</label><br><br>
{% else %}
{# <input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_ecosystem_v2#nextcloud-application-ecosystem-v2">Nextcloud Application Ecosystem V2</a>)</label><br><br> #}
{# <input type="checkbox" id="docker-socket-proxy" name="docker-socket-proxy"><label for="docker-socket-proxy">Docker Socket Proxy (needed for <a href="https://github.com/cloud-py-api/app_api#nextcloud-appapi">Nextcloud App API</a>)</label><br><br> #}
{% endif %}
<input id="options-form-submit" class="button" type="submit" value="Save changes" />
<script type="text/javascript" src="options-form-submit.js"></script>

View File

@@ -648,6 +648,9 @@ The [facerecognition app](https://apps.nextcloud.com/apps/facerecognition) requi
The [memories app](https://apps.nextcloud.com/apps/memories) allows to enable hardware transcoding for videos. In order to use that, you need to add `--env NEXTCLOUD_ENABLE_DRI_DEVICE=true` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) which will mount the `/dev/dri` device into the container. Additionally, you need to add required packets to the Nextcloud container by using [this feature](https://github.com/nextcloud/all-in-one#how-to-add-os-packages-permanently-to-the-nextcloud-container) and adding the required Alpine packages that are documented [here](https://memories.gallery/hw-transcoding/#va-api).
### How to keep disabled apps?
In certain situations you might want to keep Nextcloud apps that are disabled in the AIO interface and not uninstall them if they should be installed in Nextcloud. You can do so by adding `--env NEXTCLOUD_KEEP_DISABLED_APPS=true` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used). ⚠️⚠️⚠️ **Warning** doing this might cause unintended problems in Nextcloud if an app that requires an external dependency is still installed but the external dependency not for example.
### Huge docker logs
If you should run into issues with huge docker logs, you can adjust the log size by following https://docs.docker.com/config/containers/logging/local/#usage. However for the included AIO containers, this should usually not be needed because almost all of them have the log level set to warn so they should not produce many logs.

View File

@@ -541,7 +541,7 @@ The examples below define the dynamic configuration in YAML files. If you rather
http:
routers:
nextcloud:
rule: "Host(<your-nextcloud-domain>)"
rule: "Host(`<your-nextcloud-domain>`)"
entrypoints:
- "https"
service: nextcloud

View File

@@ -20,5 +20,6 @@ See https://github.com/nextcloud/all-in-one#how-to-trust-user-defined-certificat
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_ADDITIONAL_APKS=zip`, the resulting Nextcloud container should have the zip package installed and not imagemagick.
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=inotify`, the resulting Nextcloud container should have the inotify extension installed and not the imagick extension.
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_ENABLE_DRI_DEVICE=true`, the resulting Nextcloud container should have the /dev/dri device mounted into the container. (Only works if a `/dev/dri` device is present on the host)
- [ ] When starting the mastercontainer with `--env NEXTCLOUD_KEEP_DISABLED_APPS=true` it should keep apps in Nextcloud that are disabled in the AIO interface. For example if Collabora is disabled in the AIO interface and you install the richdocuments app in Nextcloud, a restart should not uninstall the richdocuments app in Nextcloud anymore.
You can now continue with [070-timezone-change.md](./070-timezone-change.md)