Compare commits

...

12 Commits

Author SHA1 Message Date
Simon L
f540d54e2a Merge pull request #2451 from nextcloud/aio-helm-update
Helm Chart updates
2023-05-01 14:16:05 +02:00
szaimen
e78ef7a31a Helm Chart updates
Signed-off-by: GitHub <noreply@github.com>
2023-05-01 12:07:37 +00:00
Simon L
ccb97e9540 Merge pull request #2426 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-23.0.5-cli
Bump docker from 23.0.4-cli to 23.0.5-cli in /Containers/mastercontainer
2023-05-01 11:52:02 +02:00
Simon L
792f4daf6d update php lint name
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 10:25:11 +02:00
Simon L
b349135dfb Merge pull request #2442 from nextcloud/enh/noid/twig-lint
add twig-lint
2023-05-01 10:19:13 +02:00
Simon L
eaf26a2ec3 add twig-lint
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-05-01 04:44:54 +02:00
Simon L
1118ba6764 add a passage about waiting for container to be bult before testing
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 15:19:22 +02:00
dependabot[bot]
070242cda8 Bump docker from 23.0.4-cli to 23.0.5-cli in /Containers/mastercontainer
Bumps docker from 23.0.4-cli to 23.0.5-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-04-27 13:17:33 +00:00
Simon L
608fea6460 adjust workflows to add to review label automatically
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 15:16:58 +02:00
Simon L
7cb12f7893 make it even more verbose that the default command is not to be used behind a reverse proxy
Signed-off-by: Simon L <szaimen@e.mail.de>
2023-04-27 10:35:01 +02:00
Simon L
454870ad49 Merge pull request #2422 from thijsvanderwoude/main
Fix minor typo
2023-04-26 08:55:56 +02:00
Thijs van der Woude
617c882015 Fix minor typo
Signed-off-by: Thijs van der Woude <31108288+thijsvanderwoude@users.noreply.github.com>
2023-04-26 01:28:12 +02:00
23 changed files with 79 additions and 21 deletions

View File

@@ -50,6 +50,6 @@ jobs:
signoff: true
title: Dependency updates
body: Automated dependency updates since dependabot does not support grouped updates
labels: dependencies, enhancement
labels: dependencies, 3. to review
milestone: next
branch: aio-dependency-update

View File

@@ -28,6 +28,6 @@ jobs:
signoff: true
title: Imaginary update
body: Automated Imaginary container update
labels: dependencies, enhancement
labels: dependencies, 3. to review
milestone: next
branch: imaginary-container-update

View File

@@ -3,7 +3,7 @@
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
name: Lint
name: PHP Lint
on:
pull_request:

View File

@@ -72,6 +72,6 @@ jobs:
signoff: true
title: Nextcloud update
body: Automated Nextcloud container update
labels: dependencies, enhancement
labels: dependencies, 3. to review
milestone: next
branch: nextcloud-container-update

View File

@@ -42,7 +42,8 @@ jobs:
# Make sure we can open multiple PRs
branch-suffix: timestamp
title: '[Automated] Update psalm-baseline.xml'
milestone: next
body: |
Auto-generated update psalm-baseline.xml with fixed psalm warnings
labels: |
3. to review
3. to review, dependencies

55
.github/workflows/twig-lint.yml vendored Normal file
View File

@@ -0,0 +1,55 @@
name: Twig Lint
on:
pull_request:
push:
branches:
- main
permissions:
contents: read
concurrency:
group: lint-twig-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
twig-lint:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["8.1"]
name: twig-lint
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-versions }}
coverage: none
- name: twig lint
run: |
cd php
composer require sserbin/twig-linter:@dev --no-progress --dev
composer install
chmod +x ./vendor/bin/twig-linter
./vendor/bin/twig-linter lint ./templates
summary:
permissions:
contents: none
runs-on: ubuntu-latest
needs: twig-lint
if: always()
name: twig-lint-summary
steps:
- name: Summary status
run: if ${{ needs.twig-lint.result != 'success' && needs.twig-lint.result != 'skipped' }}; then exit 1; fi

View File

@@ -27,7 +27,7 @@ jobs:
signoff: true
title: Helm Chart updates
body: Automated Helm Chart updates for the yaml files. It can be merged if it looks good at any time which will automatically trigger a new release of the helm chart.
labels: dependencies
labels: dependencies, 3. to review
milestone: next
branch: aio-helm-update
token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -22,7 +22,7 @@ jobs:
signoff: true
title: Yaml updates
body: Automated yaml updates for the docker-compose files. Should only be merged shortly before the next latest release.
labels: dependencies
labels: dependencies, 3. to review
milestone: next
branch: aio-yaml-update
token: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -1,5 +1,5 @@
# Docker CLI is a requirement
FROM docker:23.0.4-cli as docker
FROM docker:23.0.5-cli as docker
# Caddy is a requirement
FROM caddy:2.6.4-alpine as caddy

View File

@@ -22,6 +22,8 @@ Simply use https://github.com/nextcloud/all-in-one/issues/180 as template.
Go to https://github.com/nextcloud-releases/all-in-one/actions/workflows/repo-sync.yml and run the workflow that will first sync the repo and then build new container that automatically get published to `develop` and `develop-arm64`.
## How to test things correctly?
Before testing, make sure that at least the amd64 containers are built successfully by checking the last workflow here: https://github.com/nextcloud-releases/all-in-one/actions/workflows/build_images.yml.
There is a testing-VM available for the maintainer of AIO that allows for some final testing before releasing new version. See [this](https://cloud.nextcloud.com/apps/collectives/Nextcloud%20Handbook/Technical/AIO%20testing%20VM?fileId=6350152) for details.
## How to promote builds from develop to beta

View File

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

View File

@@ -54,7 +54,7 @@ spec:
value: nextcloud-aio-talk
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-apache:20230422_090326-latest
image: nextcloud/aio-apache:20230501_090621-latest
name: nextcloud-aio-apache
ports:
- containerPort: {{ .Values.APACHE_PORT }}

View File

@@ -38,7 +38,7 @@ spec:
value: "90"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-clamav:20230422_090326-latest
image: nextcloud/aio-clamav:20230501_090621-latest
name: nextcloud-aio-clamav
ports:
- containerPort: 3310

View File

@@ -44,7 +44,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:20230422_090326-latest
image: nextcloud/aio-collabora:20230501_090621-latest
name: nextcloud-aio-collabora
ports:
- containerPort: 9980

View File

@@ -46,7 +46,7 @@ spec:
value: nextcloud
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-postgresql:20230422_090326-latest
image: nextcloud/aio-postgresql:20230501_090621-latest
name: nextcloud-aio-database
ports:
- containerPort: 5432

View File

@@ -42,7 +42,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: discovery.type
value: single-node
image: nextcloud/aio-fulltextsearch:20230422_090326-latest
image: nextcloud/aio-fulltextsearch:20230501_090621-latest
name: nextcloud-aio-fulltextsearch
ports:
- containerPort: 9200

View File

@@ -26,7 +26,7 @@ spec:
- env:
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-imaginary:20230422_090326-latest
image: nextcloud/aio-imaginary:20230501_090621-latest
name: nextcloud-aio-imaginary
ports:
- containerPort: 9000

View File

@@ -114,7 +114,7 @@ spec:
value: "{{ .Values.TIMEZONE }}"
- name: UPDATE_NEXTCLOUD_APPS
value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
image: nextcloud/aio-nextcloud:20230422_090326-latest
image: nextcloud/aio-nextcloud:20230501_090621-latest
name: nextcloud-aio-nextcloud
ports:
- containerPort: 9000

View File

@@ -42,7 +42,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-onlyoffice:20230422_090326-latest
image: nextcloud/aio-onlyoffice:20230501_090621-latest
name: nextcloud-aio-onlyoffice
ports:
- containerPort: 80

View File

@@ -37,7 +37,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-redis:20230422_090326-latest
image: nextcloud/aio-redis:20230501_090621-latest
name: nextcloud-aio-redis
ports:
- containerPort: 6379

View File

@@ -34,7 +34,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}"
- name: TZ
value: "{{ .Values.TIMEZONE }}"
image: nextcloud/aio-talk:20230422_090326-latest
image: nextcloud/aio-talk:20230501_090621-latest
name: nextcloud-aio-talk
ports:
- containerPort: {{ .Values.TALK_PORT }}

View File

@@ -80,7 +80,7 @@ The following instructions are meant for installations without a web server or r
curl -fsSL https://get.docker.com | sudo sh
```
1. If you need ipv6 support, you should enable it by following https://github.com/nextcloud/all-in-one/blob/main/docker-ipv6-support.md.
2. Run the command below in order to start the container:
2. Run the command below in order to start the container on Linux and without a web server or reverse proxy (like Apache, Nginx and else) already in place:
```
# For Linux and without a web server or reverse proxy (like Apache, Nginx and else) already in place:
sudo docker run \

View File

@@ -28,7 +28,7 @@ In order to run Nextcloud behind a web server or reverse proxy (like Apache, Ngi
Add this as a new Apache site config:
(The config below assumse that you are using certbot to get your certificates. You need to create them first in order to make it work.)
(The config below assumes that you are using certbot to get your certificates. You need to create them first in order to make it work.)
```
<VirtualHost *:80>