Compare commits

...

18 Commits

Author SHA1 Message Date
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
dfe1ac9013 Yaml updates
Signed-off-by: GitHub <noreply@github.com>
2023-09-11 12:02:32 +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
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
40 changed files with 71 additions and 48 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

@@ -5,7 +5,7 @@ FROM docker:24.0.5-cli as docker
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

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

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

@@ -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!

2
php/composer.lock generated
View File

@@ -1793,5 +1793,5 @@
"ext-apcu": "*"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.6.0"
}

View File

@@ -16,7 +16,7 @@
</header>
<div class="content">
<h1>Nextcloud AIO v7.1.0</h1>
<h1>Nextcloud AIO v7.1.1</h1>
{# Add 2nd tab warning #}
<script type="text/javascript" src="second-tab-warning.js"></script>

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