feat(sh):Create 2 environment variables

I create APPS and SERVER_GIT_WITH_ORGANIZATIO env var when we generate the .env file. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
build(sh): Fix shellchecl add source=/dev/null
2022-11-08 15:38:57 +01:00 · 2022-11-08 15:38:17 +01:00 · 2022-11-08 11:40:22 +01:00 · 2022-11-08 11:32:27 +01:00 · 2022-11-08 11:23:46 +01:00 · 2022-11-08 11:20:35 +01:00
108 changed files with 3731 additions and 5569 deletions
@@ -1,11 +0,0 @@
-version: 2
-updates:
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "docker"
-    directory: "/docker/"
-    schedule:
-      interval: "daily"
@@ -7,135 +7,78 @@ on:
  push:
    branches:
      - master
-  release:
-    types: [published]


 jobs:
  push_to_registry:
    name: Build image
    runs-on: ubuntu-latest
-    if: github.repository == 'juliushaertl/nextcloud-docker-dev'
    strategy:
      fail-fast: false
      matrix:
        container:
-          - php83
-          - php82
          - php81
          - php80
          - php74
          - php73
          - php72
-          - php71
-          - push
          - saml
          - nginx
          - elasticsearch
          - mailhog
          - ldap
          - lookupserver
-          - smb
-          - codedev
-          - code
-          - talk-janus
    permissions:
      packages: write
      contents: read
    steps:
      - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
      - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v2
        with:
          path: /tmp/.buildx-cache
          key: ${{ matrix.container }}-buildx-${{ github.sha }}
          restore-keys: |
            ${{ matrix.container }}-buildx-
      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Available platforms
        run: echo ${{ steps.buildx.outputs.platforms }}
-      - name: Set dockerfile path
-        id: dockerfile
-        run: |
-          NAME="${{ matrix.container }}"
-          DOCKERFILE=$([[ -f "docker/$NAME/Dockerfile" ]] && echo "docker/$NAME/Dockerfile" || echo "docker/Dockerfile.$NAME")
-          echo "DOCKERFILE=$DOCKERFILE" >> $GITHUB_OUTPUT
      - name: Build container image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
        with:
          push: false
          context: docker/
          platforms: linux/amd64,linux/arm64
-          file: ${{ steps.dockerfile.outputs.DOCKERFILE }}
+          file: docker/Dockerfile.${{ matrix.container }}
          tags: |
-            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}:${{ github.sha }}
+            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}
          cache-from: type=local,src=/tmp/.buildx-cache
          cache-to: type=local,dest=/tmp/.buildx-cache-new
-      - name: Start containers with docker compose
-        run: |
-          ./bootstrap.sh
-          PHP_VERSION=$(echo ${{ matrix.container }} | sed -e 's/^php//')
-          echo "PHP_VERSION=${PHP_VERSION}" >> .env
-          # exit if php version is not numeric or below 80
-          if ! [[ $PHP_VERSION =~ ^[0-9]+$ ]] || [[ $PHP_VERSION -lt 80 ]]; then
-            exit 0
-          fi
-          docker-compose up -d nextcloud
-          # wait for nextcloud to be up
-          # wait up to 5 minutes
-          for i in {1..300}; do
-            if curl -s http://nextcloud.local/index.php/login | grep -q 'Login'; then
-              break
-            fi
-            sleep 1
-          done
-          curl http://nextcloud.local/status.php
-      - uses: actions/setup-node@v3
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
-        with:
-          node-version: 18
-      - name: Install dependencies
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
-        working-directory: tests
-        run: npm ci
-      - name: Install Playwright Browsers
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
-        working-directory: tests
-        run: npx playwright install --with-deps
-      - name: Run Playwright tests
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
-        working-directory: tests
-        run: npx playwright test
-      - uses: actions/upload-artifact@v3
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
-        with:
-          name: playwright-report
-          path: tests/playwright-report/
-          retention-days: 30
      - name: Push container image
-        uses: docker/build-push-action@v5
-        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: docker/build-push-action@v2
+        if: github.ref == 'refs/heads/master'
        with:
          push: true
          context: docker/
          platforms: linux/amd64,linux/arm64
-          file: ${{ steps.dockerfile.outputs.DOCKERFILE }}
+          file: docker/Dockerfile.${{ matrix.container }}
          tags: |
-            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}:${{ github.event_name == 'release' && 'latest' || 'nightly' }}
-            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}:${{ github.ref_name }}
+            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}
          cache-from: type=local,src=/tmp/.buildx-cache
          cache-to: type=local,dest=/tmp/.buildx-cache-new
      - name: Move cache
        run: |
          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+
@@ -1,51 +0,0 @@
-name: Publish MkDocs to GitHub Pages
-on:
-  push:
-    branches:
-      - master
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Single deploy job since we're just deploying
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.x
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install mkdocs mkdocs-material
-      - name: Build MkDocs
-        run: mkdocs build
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
-        with:
-          # Upload entire repository
-          path: './site'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
@@ -11,6 +11,6 @@ jobs:
    name: Shellcheck
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: Run ShellCheck
      uses: ludeeus/action-shellcheck@master
@@ -1,15 +1,10 @@
-/.vscode
-/data/ssl/
-/data/shared/
-/workspace/
-/.env
-/*.env
+data/ssl/
+data/shared/
+workspace/
+.env
+*.env
 !example.env
-/data/skeleton/
-/wip/
-/site
-node_modules/
-/tests/test-results/
-/tests/playwright-report/
-/tests/blob-report/
-/tests/playwright/.cache/
+.*
+data/skeleton/
+wip/
+my-apps/
@@ -1,44 +1,25 @@
 SHELL := /bin/bash

-.PHONY: images docker-build pull-all docs docs-watch
-
+.PHONY: images
 .ONESHELL:
-images: docker/*/Dockerfile docker/Dockerfile.*
-
-.ONESHELL:
-pull-all:
+images:
 	for file in $$(find docker/ -maxdepth 1 -type f -iname 'Dockerfile.*'); do \
-		NAME=$$(echo $$file | sed 's/^.*\.//'); \
-		echo "=> Pulling image $$NAME"; docker pull "ghcr.io/juliushaertl/nextcloud-dev-$${NAME}"; \
-	done
-	for file in $$(find docker -maxdepth 2 -type f -iname 'Dockerfile'); do \
-		NAME=$$(basename $$(dirname $$file)); \
-		echo "=> Pulling image $$NAME"; docker pull "ghcr.io/juliushaertl/nextcloud-dev-$${NAME}"; \
+		NAME=$$(echo $$file | sed 's/^.*\.//'); echo "=> Building image $$NAME"; \
+		(cd docker && docker build -t ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest -f Dockerfile.$$NAME .)
 	done

-pull-installed:
-	docker image ls | grep juliushaertl/nextcloud-dev | cut -f 1 -d " "
-	docker image ls | grep juliushaertl/nextcloud-dev | cut -f 1 -d " " | xargs -L 1 docker pull
-
-# Empty target to always build
-docker-build:
-
-docker/%/Dockerfile: docker-build
-	NAME=$$(basename $$(dirname $@)); \
-	echo "=> Building dockerfile" $@ as ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest; \
-	(cd docker && docker build -t ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest -f $$NAME/Dockerfile .)
-
-docker/Dockerfile.%: docker-build
-	NAME=$$(echo $$(basename $@) | sed 's/^.*\.//'); \
-	echo "=> Building dockerfile" $@ as ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest; \
-	(cd docker && docker build -t ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest -f Dockerfile.$$NAME .)
+.PHONY: pull
+.ONESHELL:
+pull:
+	for file in $$(find docker/ -maxdepth 1 -type f -iname 'Dockerfile.*'); do \
+		NAME=$$(echo $$file | sed 's/^.*\.//'); echo "=> Pulling image $$NAME"; docker pull "ghcr.io/juliushaertl/nextcloud-dev-$${NAME}"; \
+	done

 check: dockerfilelint shellcheck

 .ONESHELL:
 dockerfilelint:
 	for file in $$(find docker/ -type f -iname 'Dockerfile.*' -maxdepth 1); do dockerfilelint $$file; done;
-	for file in $$(find docker -type f -iname 'Dockerfile' -maxdepth 2); do dockerfilelint $$file; done;

 .ONESHELL:
 shellcheck:
@@ -47,19 +28,9 @@ shellcheck:

 .ONESHELL:
 template-apply:
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:7.1/' > docker/Dockerfile.php71
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:7.2/' > docker/Dockerfile.php72
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:7.3/' > docker/Dockerfile.php73
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:7.4/' > docker/Dockerfile.php74
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:8.0/' > docker/Dockerfile.php80
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:8.1/' > docker/Dockerfile.php81
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:8.2/' > docker/php82/Dockerfile
-	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:8.3/' > docker/php83/Dockerfile
-
-docs:
-	pip3 install mkdocs
-	mkdocs
-
-docs-watch:
-	pip3 install mkdocs
-	mkdocs serve
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:7.1/' > docker/Dockerfile.php71
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:7.2/' > docker/Dockerfile.php72
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:7.3/' > docker/Dockerfile.php73
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:7.4/' > docker/Dockerfile.php74
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:8.0/' > docker/Dockerfile.php80
+	cat docker/Dockerfile.php.template | sed 's/php:8.1/php:8.1/' > docker/Dockerfile.php81
@@ -1,99 +1,339 @@
-# Nextcloud development environment on Docker Compose
+# nextcloud-dev-docker-compose

-Nextcloud development environment using docker-compose providing a large variety of services for Nextcloud server and app development and testing.
+Nextcloud development environment using docker-compose

 ⚠ **DO NOT USE THIS IN PRODUCTION** Various settings in this setup are considered insecure and default passwords and secrets are used all over the place

- ☁ Nextcloud containers for running multiple versions
- 🐘 Multiple PHP versions
- 🔒 Nginx proxy with optional SSL termination
- 🛢️ MySQL/PostgreSQL/MariaDB/SQLite/MaxScale, Redis cache
- 💾 Local or S3 primary storage
- 👥 LDAP with example user data, Keycloak
- ✉ Mailhog for testing mail sending
- 🚀 Blackfire, Xdebug for profiling and debugging
- 📄 Lots of integrating service containers: Collabora Online, Onlyoffice, Elasticsearch, ...
+Features

-## Tutorial
+- ☁ Nextcloud
+- 🔒 Nginx proxy with SSL termination
+- 💾 MySQL
+- 💡 Redis
+- 👥 LDAP with example user data
+- ✉ Mailhog
+- 🚀 Blackfire
+- 📄 Collabora

-You can find a step by step tutorial on how to use this setup in the [Nextcloud Developer Portal](https://nextcloud.com/developer/). It will guide you through the setup and show you how to use it for app development: https://cloud.nextcloud.com/s/iyNGp8ryWxc7Efa?path=%2F1%20Setting%20up%20a%20development%20environment
+## Getting started

-In detail explanation of the setup and its features and configuration options can be found in the [nextcloud-docker-dev documentation](https://juliushaertl.github.io/nextcloud-docker-dev/).
+To get the setup running:

-## Quickstart
-
-### Persistent development setup
-
-> [!TIP]
-> This is the recommended way to run the setup for development. You will have a local clone of all required source code.
-
-To start the setup run the following commands to clone the repository and bootstrap the setup. This will prepare your setp and clone the Nextcloud server repository and required apps into the `workspace` folder.
-```bash
+```
 git clone https://github.com/juliushaertl/nextcloud-docker-dev
 cd nextcloud-docker-dev
 ./bootstrap.sh
+sudo sh -c "echo '127.0.0.1 nextcloud.local' >> /etc/hosts"
+docker-compose up nextcloud proxy
 ```

-This may take some time depending on your internet connection speed.
+## Manual setup

-Once done you can start the Nextcloud container using:
-```bash
-docker-compose up nextcloud
+### Nextcloud Code
+
+The Nextcloud code base needs to be available including the `3rdparty` submodule. To clone it from github run:
+
+```
+git clone https://github.com/nextcloud/server.git
+cd server
+git submodule update --init
+pwd
+```
+The last command prints the path to the Nextcloud server directory.
+Use it for setting the `REPO_PATH_SERVER` in the next step.
+
+### Environment variables
+
+A `.env` file should be created in the repository root, to keep configuration default on the dev setup:
+
+```
+cp example.env .env
 ```

-You can also start it in the background using `docker-compose up -d nextcloud`.
+Replace `REPO_PATH_SERVER` with the path from above.

-You can then access your Nextcloud instance at [http://nextcloud.local](http://nextcloud.local). The default username is `admin` and the password is `admin`. [Other users can be found in the documentation](https://juliushaertl.github.io/nextcloud-docker-dev/basics/overview/#default-users).
+### Setting the PHP version to be used

-> [!WARN]
-> Note that for performance reasons the server repository might have been cloned with `--depth=1` by default. To get the full history it is highly recommended to run:
->
-> ```bash
-> cd workspace/server
-> git fetch --unshallow
-> git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-> git fetch origin
-> ```
+The Nextcloud instance is setup to run with PHP 7.2 by default.
+If you wish to use a different version of PHP, set the `PHP_VERSION` `.env` variable.
+
+The variable supports the following values:
+
+1. PHP 7.1: `71`
+1. PHP 7.2: `72`
+1. PHP 7.3: `73`
+1. PHP 7.4: `74`
+1. PHP 8.0: `80`
+
+### Starting the containers
+
+- Start full setup: `docker-compose up`
+- Minimum: `docker-compose up proxy nextcloud` (nextcloud mysql redis mailhog)
+
+### Running stable versions
+
+The docker-compose file provides individual containers for stable Nextcloud releases. In order to run those you will need a checkout of the stable version server branch to your workspace directory. Using [git worktree](https://blog.juliushaertl.de/index.php/2018/01/24/how-to-checkout-multiple-git-branches-at-the-same-time/) makes it easy to have different branches checked out in parallel in separate directories.
+
+Note that for performance reasons the server repository might have been cloned with --depth=1 by default. To get the full history it is highly recommended to run:
+
+	cd workspace/server
+	git fetch --unshallow
+
+ This may take some time depending on your internet connection speed.
+
+```
+cd workspace/server
+git worktree add ../stable23 stable23
+cd ../stable23
+git submodule update --init
+```
+
+After adding the worktree you can start the stable container using `docker-compose up -d stable23`. You can then add stable23.local to your `/etc/hosts` file to access it.
+
+Git worktrees can also be used to have a checkout of an apps stable brach within the server stable directory.
+
+```
+cd workspace/server/apps-extra/text
+git worktree add ../../../stable23/apps-extra/text stable23
+```
+
+### Running into errors
+
+If your setup isn't working and you can not figure out the reason why, running
+`docker-compose down -v` will remove the relevant containers and volumes,
+allowing you to run `docker-compose up` again from a clean slate.
+
+## 🔒 Reverse Proxy
+
+Used for SSL termination. To setup SSL support provide a proper DOMAIN_SUFFIX environment variable and put the certificates to ./data/ssl/ named by the domain name.
+
+You might need to add the domains to your `/etc/hosts` file:
+
+```
+127.0.0.1 nextcloud.local
+127.0.0.1 collabora.local
+```
+
+This is assuming you have set `DOMAIN_SUFFIX=.local`
+
+You can generate it through:
+
+```
+awk -v D=.local '/- [A-z0-9]+\${DOMAIN_SUFFIX}/ {sub("\\$\{DOMAIN_SUFFIX\}", D " 127.0.0.1", $2); print $2}' docker-compose.yml
+```
+
+You can generate selfsigned certificates using:
+
+```
+cd data/ssl
+openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout  nextcloud.local.key -out nextcloud.local.crt
+```
+
+### dnsmasq to resolve wildcard domains
+
+Instead of adding the individual container domains to `/etc/hosts` a local dns server like dnsmasq can be used to resolve any domain ending with the configured DOMAIN_SUFFIX in `.env` to localhost.
+
+For dnsmasq adding the following configuration would be sufficient for `DOMAIN_SUFFIX=.local`:
+```
+address=/.local/127.0.0.1
+```
+
+### Use valid certificates trusted by your system
+
+* Install mkcert https://github.com/FiloSottile/mkcert
+* Go to `data/ssl`
+* `mkcert nextcloud.local`
+
+* `mv nextcloud.local-key.pem nextcloud.local.key`
+* `mv nextcloud.local.pem nextcloud.local.crt`
+* `docker-compose restart proxy`
+
+## ✉ Mail
+
+Sending/receiving mails can be tested with [mailhog](https://github.com/mailhog/MailHog) which is available on ports 1025 (SMTP).
+
+To use the webui, add `127.0.0.1 mail.local` to your `/etc/hosts` and open [mail.local](http://mail.local).
+
+## 🚀 Blackfire
+
+Blackfire needs to use a hostname/ip that is resolvable from within the blackfire container. Their free version is [limited to local profiling](https://support.blackfire.io/troubleshooting/hack-edition-users-cannot-profile-non-local-http-applications) so we need to browse Nextcloud though its local docker IP or add the hostname to `/etc/hosts`.
+
+### Using with curl
+
+```
+alias blackfire='docker-compose exec -e BLACKFIRE_CLIENT_ID=$BLACKFIRE_CLIENT_ID -e BLACKFIRE_CLIENT_TOKEN=$BLACKFIRE_CLIENT_TOKEN blackfire blackfire'
+blackfire curl http://192.168.21.8/
+```
+
+## 👥 LDAP
+
+The LDAP sample data is based on https://github.com/rroemhild/docker-test-openldap and extended with randomly generated users/groups. For details see [data/ldap-generator/](https://github.com/juliushaertl/nextcloud-docker-dev/tree/master/data/ldap-generator). LDAP will be configured automatically if the ldap container is available during installation.
+
+Example users are: `leela fry bender zoidberg hermes professor`. The password is the same as the uid.
+
+Useful commands:
+
+```
+docker-compose exec ldap ldapsearch -H 'ldap://localhost' -D "cn=admin,dc=planetexpress,dc=com" -w admin -b "dc=planetexpress,dc=com" "(&(objectclass=inetOrgPerson)(description=*use*))"
+```
+
+## Collabora
+
+- Make sure to have the collabora hostname setup in your /etc/hosts file: `127.0.0.1 collabora.local`
+- Automatically enable for one of your containers (e.g. the main nextcloud one):
+	- Run `./scripts/enable-collabora nextcloud`
+- Manual setup
+	- Start the Collabora Online server in addition to your other containers `docker-compose up -d collabora`
+	- Make sure you have the richdocuments app cloned to your apps-extra directory and built the frontend code of the app with `npm ci && npm run build`
+	- Enable the app and configure `collabora.local` in the Collabora settings inside of Nextcloud


-### Standalone containers
+## ONLYOFFICE

-> [!TIP]
-> This is a very simple way but doesn't cover all features. If you are looking for a fully featured setup you may skip to the next section
+- Make sure to have the collabora hostname setup in your /etc/hosts file: `127.0.0.1 onlyoffice.local`
+- Automatically enable for one of your containers (e.g. the main nextcloud one):
+	- Run `./scripts/enable-onlyoffice nextcloud`
+- Manual setup
+	- Start the ONLYOFFICE server in addition to your other containers `docker-compose up -d onlyoffice`
+	- Clone https://github.com/ONLYOFFICE/onlyoffice-nextcloud into your apps directory
+	- Enable the app and configure `onlyoffice.local` in the ONLYOFFICE settings inside of Nextcloud

-There is a standalone version of the Nextcloud containers available that can be used to run Nextcloud without the other services. This is useful if you are just wanting to get started with app development against a specific server version, or to just have a quick way to develop, test or debug.

-These containers support automatic fetching of the server source code and use SQLite as the database. The server source code is fetched from the official Nextcloud server repository and the version can be specified using the `NEXTCLOUD_VERSION` environment variable. The default version is `master`.
-
-Running the containers does not need this repository to be cloned.
-
-Example for running a Nextcloud server from the master branch of server:
+## Antivirus

 ```bash
-docker run --rm -p 8080:80 ghcr.io/juliushaertl/nextcloud-dev-php80:latest
+docker-compose up -d proxy nextcloud av
 ```

-For app development you can mount your app directly into the container:
+The clanav antivirus will then be exposed as a deamon with host `clam` and
+port 3310.
+
+## SAML
+
+```
+docker-compose up -d proxy nextcloud saml
+```
+
+- uid mapping: `urn:oid:0.9.2342.19200300.100.1.1`
+- idp entity id: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/metadata.php`
+- single sign on service url: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/SSOService.php`
+- single log out service url: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/SingleLogoutService.php`
+- use certificate from docker/configs/var-simplesamlphp/cert/example.org.crt
+  ```
+  -----BEGIN CERTIFICATE-----
+  MIICrDCCAhWgAwIBAgIUNtfnC2jE/rLdxHCs2th3WaYLryAwDQYJKoZIhvcNAQEL
+  BQAwaDELMAkGA1UEBhMCREUxCzAJBgNVBAgMAkJZMRIwEAYDVQQHDAlXdWVyemJ1
+  cmcxFDASBgNVBAoMC0V4YW1wbGUgb3JnMSIwIAYDVQQDDBlzc28ubG9jYWwuZGV2
+  LmJpdGdyaWQubmV0MB4XDTE5MDcwMzE0MjkzOFoXDTI5MDcwMjE0MjkzOFowaDEL
+  MAkGA1UEBhMCREUxCzAJBgNVBAgMAkJZMRIwEAYDVQQHDAlXdWVyemJ1cmcxFDAS
+  BgNVBAoMC0V4YW1wbGUgb3JnMSIwIAYDVQQDDBlzc28ubG9jYWwuZGV2LmJpdGdy
+  aWQubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHPZwU+dAc76yB6bOq
+  0AkP1y9g7aAi1vRtJ9GD4AEAsA3zjW1P60BYs92mvZwNWK6NxlJYw51xPak9QMk5
+  qRHaTdBkmq0a2mWYqh1AZNNgCII6/VnLcbEIgyoXB0CCfY+2vaavAmFsRwOMdeR9
+  HmtQQPlbTA4m5Y8jWGVs1qPtDQIDAQABo1MwUTAdBgNVHQ4EFgQUeZSoGKeN5uu5
+  K+n98o3wcitFYJ0wHwYDVR0jBBgwFoAUeZSoGKeN5uu5K+n98o3wcitFYJ0wDwYD
+  VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA25X/Ke+5dw7up8gcF2BNQ
+  ggBcJs+SVKBmPwRcPQ8plgX4D/K8JJNT13HNlxTGDmb9elXEkzSjdJ+6Oa8n3IMe
+  vUUejXDXUBvlmmm+ImJVwwCn27cSfIYb/RoZPeKtned4SCzpbEO9H/75z3XSqAZS
+  Z1tiHzYOVtEs4UNGOtz1Jg==
+  -----END CERTIFICATE-----
+  ```
+- cn `urn:oid:2.5.4.3`
+- email `urn:oid:0.9.2342.19200300.100.1.3`
+
+### Environment based SSO
+
+A simple approach to test environment based SSO with the user_saml app is to use apache basic auth with the following configuration:
+
+```
+
+<Location /login>
+	AuthType Basic
+	AuthName "SAML"
+	AuthUserFile /var/www/html/.htpasswd
+	Require valid-user
+</Location>
+<Location /index.php/login>
+	AuthType Basic
+	AuthName "SAML"
+	AuthUserFile /var/www/html/.htpasswd
+	Require valid-user
+</Location>
+<Location /index.php/apps/user_saml/saml/login>
+	AuthType Basic
+	AuthName "SAML"
+	AuthUserFile /var/www/html/.htpasswd
+	Require valid-user
+</Location>
+<Location /apps/user_saml/saml/login>
+	AuthType Basic
+	AuthName "SAML"
+	AuthUserFile /var/www/html/.htpasswd
+	Require valid-user
+</Location>
+```
+
+## Fulltextsearch
+
+```
+docker-compose up -d elasticsearch elasticsearch-ui
+```
+
+- Address for configuring in Nextcloud: `http://elastic:elastic@elasticsearch:9200`
+- Adress to access elastic search from outside: `http://elastic:elastic@elasticsearch.local`
+- Address for accessing the ui: http://elasticsearch-ui.local/
+
+`sudo sysctl -w vm.max_map_count=262144`
+
+
+
+## Object storage
+
+Primary object storage can be enabled by setting the `PRIMARY=minio` environment variable either in your .env file or in docker-compose.yml for individual containers.

 ```bash
-docker run --rm -p 8080:80 -v ~/path/to/appid:/var/www/html/apps-extra/appid ghcr.io/juliushaertl/nextcloud-dev-php80:latest
+docker-compose up proxy nextcloud minio
 ```

-The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specificing either a server branch or git tag.
+## Development
+
+### OCC
+
+Run inside of the Nextcloud container:
+```
+set XDEBUG_CONFIG=idekey=PHPSTORM
+sudo -E -u www-data php -dxdebug.remote_host=192.168.21.1 occ
+```
+
+### Useful commands
+
+- Restart apache to reload php configuration without a full container restart: `docker-compose kill -s USR1 nextcloud`
+- Access to mysql console: `mysql -h $(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' nextcloud_database-mysql_1) -P 3306 -u nextcloud -pnextcloud`
+- Run an LDAP search: `ldapsearch -x -H ldap://$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' nextcloud_ldap_1) -D "cn=admin,dc=planetexpress,dc=com" -w admin -b "dc=planetexpress,dc=com" -s subtree <filter> <attrs>`
+
+## Keycloak
+
+- Keycloak is using ldap as a user backend (make sure the ldap container is also running)
+- `occ user_oidc:provider Keycloak -c nextcloud -s 09e3c268-d8bc-42f1-b7c6-74d307ef5fde -d https://keycloak.local.dev.bitgrid.net/auth/realms/Example/.well-known/openid-configuration`
+- https://keycloak.local.dev.bitgrid.net/auth/realms/Example/.well-known/openid-configuration
+- nextcloud
+- 09e3c268-d8bc-42f1-b7c6-74d307ef5fde
+
+## Global scale
+
+```
+docker-compose up -d proxy portal gs1 gs2 lookup database-mysql
+```
+
+Users are named the same as the instance name, e.g. gs1, gs2
+
+## Imaginary
+
+Enable the imaginary server for generating previews

 ```bash
-docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 ghcr.io/juliushaertl/nextcloud-dev-php80:latest
+docker-compose up proxy nextcloud previews_hpb
+./scripts/enable-preview-imaginary.sh
 ```

-You can also mount your local server source code into the container to run a local version of Nextcloud:

-```bash
-docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 -v /tmp/server:/var/www/html ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-## More features
-
-You can find documentation for more advanced features in [nextcloud-docker-dev documentation](https://juliushaertl.github.io/nextcloud-docker-dev/) for example:
-
- Running stable Nextcloud versions in parallel
- Using different database backends
- Using HTTPS
@@ -4,122 +4,6 @@ set -o errexit
 set -o nounset
 set -o pipefail

-APPS_TO_INSTALL=(viewer recommendations files_pdfviewer profiler hmr_enabler circles)
-NEXTCLOUD_AUTOINSTALL_APPS=(viewer profiler hmr_enabler)
-SERVER_CLONE=squashed
-APPS_CLONE_FILTER=
-
-print_help() {
-	cat << EOF
-  boottrap.sh [--full-clone|--clone-no-blobs] [--clone-all-apps-filtered] [--] APPS
-
-This command will initialize the debug environment for app developers.
-
-The following options can be provided:
-
-  --full-clone      Clone the server repository with the complete history included
-  --clone-no-blobs  Clone the server repository with the history but omitting the
-                    file contents. A network connection might be required if checking
-                    out commits is done.
-                    --full-clone and --clone-no-blobs is mutually exclusive.
-  --clone-all-apps-filtered
-                    Do not only reduce the history of the server repository but also
-                    the cloned apps.
-  
-  APPS              The apps to add to the development setup on top of the default apps
-
-The default apps to be installed: ${APPS_TO_INSTALL[@]}
-EOF
-}
-
-while [ $# -gt 0 ]
-do
-	case "$1" in
-		--full-clone)
-			SERVER_CLONE=full
-			;;
-		--clone-no-blobs)
-			SERVER_CLONE=filter-blobs
-			;;
-		--clone-all-apps-filtered)
-			APPS_CLONE_FILTER=y
-			;;
-		--help|-h)
-			print_help
-			exit 0
-			;;
-		--)
-			shift
-			break
-			;;
-		*)
-			APPS_TO_INSTALL+=("$1")
-			NEXTCLOUD_AUTOINSTALL_APPS+=("$1")
-			;;
-	esac
-	shift
-done
-
-# You can specify additional apps to install on the command line.
-APPS_TO_INSTALL+=( "$@" )
-NEXTCLOUD_AUTOINSTALL_APPS+=( "$@" )
-
-# Already executed
-if [ -f ".env" ]; then
-	echo "⏩ .env file found, so assuming you already ran this script."
-	echo " Validating the setup"
-	# shellcheck disable=SC1091
-	source .env
-
-	set +o errexit
-	echo "Server master repository path: ${REPO_PATH_SERVER}"
-	REPO_VERSION=$(grep "OC_VersionString" "${REPO_PATH_SERVER}/version.php" | cut -d "'" -f 2)
-	if [ -d "$REPO_PATH_SERVER" ] && [ -n "$REPO_VERSION" ]; then
-		echo "✅ $REPO_VERSION"
-	elif [ -z "$REPO_VERSION" ]; then
-		echo "❌ Repository version.php cannot be detected"
-	else
-		echo "❌ Repository path does not exist"
-	fi
-
-	for i in stable26 stable27 stable28
-	do
-		echo "Stable $i repository path: ${STABLE_ROOT_PATH}/${i}"
-		STABLE_VERSION=$(grep "OC_VersionString" "${STABLE_ROOT_PATH}/${i}/version.php" | cut -d "'" -f 2)
-		if [ -d "${STABLE_ROOT_PATH}/${i}" ] && [ -n "$STABLE_VERSION" ]; then
-			echo "✅ $STABLE_VERSION"
-		elif [ -z "$REPO_VERSION" ]; then
-			echo "❌ $i version.php cannot be detected"
-		else
-			echo "❌ $i repository path does not exist"
-		fi
-	done
-
-	exit 0
-fi
-
-case $SERVER_CLONE in
-	squashed)
-		CLONE_PARAMS=(--depth 1)
-		;;
-	clone-no-blobs)
-		CLONE_PARAMS=(--filter blob:none)
-		;;
-	full)
-		CLONE_PARAMS=()
-		;;
-	*)
-		echo "Unknown cloning parameter $SERVER_CLONE was found. Please report this."
-		exit 1
-esac
-
-if [ -n "$APPS_CLONE_FILTER" ]
-then
-	APPS_CLONE_PARAMS=("${CLONE_PARAMS[@]}")
-else
-	APPS_CLONE_PARAMS=()
-fi
-
 indent() {
 	sed 's/^/    /'
 }
@@ -132,35 +16,30 @@ indent_cli() {
 	fi
 }

-function install_server() {
-	if [ -d workspace/server/.git ]; then
-		echo "🆗 Server is already installed." | indent
-		return
-	fi
-	mkdir -p workspace/
-	(
-		(
-			echo "🌏 Fetching server (this might take a while to finish)" &&
-				git clone "${CLONE_PARAMS[@]}" https://github.com/nextcloud/server.git --depth 1 workspace/server --progress 2>&1 &&
-				cd workspace/server && git submodule update --init --progress 2>&1
-		) || echo "❌ Failed to clone Nextcloud server code"
-	) | indent
-}
-
 function install_app() {
-	TARGET=workspace/server/apps-extra/"$1"
-	if [ -d "$TARGET"/.git ]; then
-		echo "🆗 App $1 is already installed." | indent
-		return
-	fi
 	(
 		echo "🌏 Fetching $1"
-		(git clone "${APPS_CLONE_PARAMS[@]}" https://github.com/nextcloud/"$1".git "$TARGET" 2>&1 | indent_cli &&
+		(git clone "$SERVER_GIT_WITH_ORGANIZATION/$1".git "$PWD/my-apps/$1" 2>&1 | indent_cli &&
 			echo "✅ $1 installed") ||
 			echo "❌ Failed to install $1"
 	) | indent
 }

+function install_apps() {
+	if (( ${#APPS[@]} != 0 )); then
+		if test -z "$SERVER_GIT_WITH_ORGANIZATION"; then
+			echo "❌ You didn't define the $SERVER_GIT_WITH_ORGANIZATION variable."
+			exit 10
+		fi
+		echo "⏩ Clonning of applications in progress"
+		for app in "${APPS[@]}"; do
+			install_app "$app"
+		done
+	else
+		echo "⚠️ You don't have apps to clone."
+	fi
+}
+
 function is_installed() {
 	(
 		if [ -x "$(command -v "$1")" ]; then
@@ -179,11 +58,31 @@ is_installed docker
 is_installed docker-compose
 is_installed git

-(
+( 
 	(docker ps 2>&1 >/dev/null && echo "✅ Docker is properly executable") ||
 		(echo "❌ Cannot run docker ps, you might need to check that your user is able to use docker properly" && exit 1)
 ) | indent

+echo
+echo "⏩ Setting up folder structure and fetching repositories"
+
+mkdir -p workspace/
+( 
+	(
+		echo "🌏 Fetching server (this might take a while to finish)" &&
+			git clone https://github.com/nextcloud/server.git --depth 1 workspace/server 2>&1 | indent_cli &&
+			cd workspace/server && git submodule update --init 2>&1 | indent_cli
+	) || echo "❌ Failed to clone Nextcloud server code"
+) | indent
+
+#(
+#	(
+#		cd workspace/server && \
+#		git worktree add ../stable19 stable19 2>&1 | indent_cli
+#	) || echo "❌ Failed to setup worktree for stable19"
+#) | indent
+
+mkdir -p ./my-apps

 echo
 echo
@@ -191,21 +90,22 @@ echo "⏩ Setup your environment in an .env file"
 if [ ! -f ".env" ]; then
 cat <<EOT >.env
 COMPOSE_PROJECT_NAME=master
-PROTOCOL=http
 DOMAIN_SUFFIX=.local
 REPO_PATH_SERVER=$PWD/workspace/server
+ADDITIONAL_APPS_PATH=$PWD/my-apps
 STABLE_ROOT_PATH=$PWD/workspace
-NEXTCLOUD_AUTOINSTALL_APPS="${NEXTCLOUD_AUTOINSTALL_APPS[@]}"
+NEXTCLOUD_AUTOINSTALL_APPS="viewer profiler"
 DOCKER_SUBNET=192.168.21.0/24
 PORTBASE=821
-PHP_XDEBUG_MODE=develop
-# SQL variant to use, possible values: sqlite, mysql, pgsql
-SQL=mysql
-# other values: "database-postgres"
+APPS=()
+SERVER_GIT_WITH_ORGANIZATION=""
 EOT
 fi

-./scripts/update-hosts
+# shellcheck source=/dev/null
+source .env
+
+install_apps

 if [[ $(uname -m) == 'arm64' ]]; then
 	echo "Setting custom containers for arm platform"
@@ -214,15 +114,6 @@ if [[ $(uname -m) == 'arm64' ]]; then
 	echo "CONTAINER_KEYCLOAK=mihaibob/keycloak:15.0.1" >> .env
 fi

-echo
-echo "⏩ Setting up folder structure and fetching repositories"
-install_server
-mkdir -p workspace/server/apps-extra
-for app in "${APPS_TO_INSTALL[@]}"
-do
-	install_app "$app"
-done
-
 cat <<EOF


@@ -243,46 +134,16 @@ cat <<EOF
 🗑  Fresh install and wipe all data

 	$ docker-compose down -v
-EOF

-case $SERVER_CLONE in
-	squashed)
-		cat <<EOF

 	Note that for performance reasons the server repository has been cloned with
 	--depth=1. To get the full history it is highly recommended to run:

 	$ cd workspace/server
 	$ git fetch --unshallow
-	$ git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-	$ git fetch origin

 	This may take some time depending on your internet connection speed.

-	You might as well use the script in scripts/download-full-history.sh.
-EOF
-		;;
-	clone-no-blobs)
-		cat <<EOF
-
-	Note that for performance reasons the server repository has been cloned with
-	--filter=blob:none. You have a complete history in the server repository.
-	If you checkout older commits, git will eventually download missing blobs on
-	the fly if they are not present locally.
-
-	You should be prepared to have a live internet connection when browsing the
-	history of the server repository.
-
-	You might as well use the script in scripts/download-full-history.sh.
-EOF
-		;;
-	full)
-		;;
-esac
-
-
-
-cat <<EOF

 For more details about the individual setup options see
 the README.md file or checkout the repo at
@@ -1,4 +1,69 @@
 <?php
-// This file is deprecated, please put your custom config in data/shared/config.php from now on
-$CONFIG = array(
+// FIXME: Move everything except the last part to the containers
+// set the hostname to the VIRTUAL_HOST set for the docker container, otherwise fallback to the docker hostname
+$hostname = gethostname();
+$primary = isset($_ENV['PRIMARY']) ? $_ENV['PRIMARY'] : '';
+$virtualHost = isset($_ENV['VIRTUAL_HOST']) ? $_ENV['VIRTUAL_HOST'] : '';
+$virtualHost = explode(".", $virtualHost);
+if (count($virtualHost) > 0) {
+	$hostname = array_shift($virtualHost);
+}
+
+$CONFIG = [];
+if ($primary === 'minio') {
+	$CONFIG += [
+		'objectstore' =>
+		array (
+			'class' => 'OC\\Files\\ObjectStore\\S3',
+			'arguments' =>
+			array (
+				'bucket' => 'nc-' . $hostname,
+				'key' => 'nextcloud',
+				'secret' => 'nextcloud',
+				'hostname' => 'minio',
+				'port' => '9000',
+				'use_ssl' => false,
+				'use_path_style' => true,
+				'autocreate' => true,
+				'verify_bucket_exists' => true,
+			),
+		)
+	];
+}
+
+if ($primary === 'minio-multibucket') {
+	$CONFIG += [
+		'objectstore_multibucket' => array(
+			'class' => 'OC\\Files\\ObjectStore\\S3',
+			'arguments' => array(
+				// optional, defaults to 64
+				'num_buckets' => 64,
+				// n integer in the range from 0 to (num_buckets-1) will be appended
+				'bucket' => 'nextcloud_',
+				'bucket' => 'nc-' . $hostname,
+				'key' => 'nextcloud',
+				'secret' => 'nextcloud',
+				'hostname' => 'minio',
+				'port' => '9000',
+				'use_ssl' => false,
+				'use_path_style' => true,
+			),
+		),
+	];
+}
+
+// Useful config values during development
+$CONFIG += array(
+	'debug' => true,
+	'loglevel' => 2,
+
+	//  'htaccess.RewriteBase' => '/',
+	'log_query' => false,
+	'query_log_file' => '/var/www/html/data/query.log',
+
+	'diagnostics.logging' => false,
+	'diagnostics.logging.threshold' => 0,
+	'log.condition' => [
+        'apps' => ['diagnostics', 'admin_audit'],
+	],
 );
@@ -1 +0,0 @@
-nextcloud.local:5432:database-postgres:postgres:postgres
@@ -1,14 +0,0 @@
-{
-    "Servers": {
-        "1": {
-            "Name": "nextcloud.local",
-            "Group": "Server Group 1",
-            "Port": 5432,
-            "Username": "postgres",
-            "Host": "database-postgres",
-            "SSLMode": "prefer",
-            "MaintenanceDB": "postgres",
-            "PassFile": "/pgadmin4/config/pgpassfile"
-        }
-    }
-}
@@ -1,40 +0,0 @@
-# Keycloak SAML test setup
-
-Currently the Keycloak realm only supports the main instance (nextcloud.local). For other instances this would need a separate realm and adjusting the imported realm in `docker/configs/keycloak`.
-
-Setup can be done automatically through:
-
-```bash
-occ saml:config:create
-occ saml:config:set \
-        --general-idp0_display_name "Keycloak SAML" \
-        --general-uid_mapping "username" \
-        --idp-entityId "http://keycloak.local/realms/Example" \
-        --idp-singleLogoutService.url "http://keycloak.local/realms/Example/protocol/saml" \
-        --idp-singleSignOnService.url "http://keycloak.local/realms/Example/protocol/saml" \
-        --idp-x509cert="$(cat keycloak.crt)" \
-        --security-authnRequestsSigned 1 \
-        --security-logoutRequestSigned 1 \
-        --security-logoutResponseSigned 1 \
-        --security-wantAssertionsEncrypted 0 \
-        --security-wantAssertionsSigned 1 \
-        --security-wantMessagesSigned 1 \
-        --security-nameIdEncrypted 0 --security-wantNameId 0 \
-        --security-wantNameIdEncrypted 0 \
-        --sp-x509cert="$(cat public.cert)" \
-        --sp-privateKey="$(cat private.key)" \
-        "1"
-```
-
-## References
-
- Setup keycloak for SAML usage: https://janikvonrotz.ch/2020/04/21/configure-saml-authentication-for-nextcloud-with-keycloack/
-
-## Generate keys for Nextcloud
-
-openssl req  -nodes -new -x509  -keyout private.key -out public.crt
-
-
-## update keycloak from example realm
-
-nc-dev exec keycloak /opt/keycloak/bin/kc.sh export --realm Example --users skip --dir /opt/keycloak/data/import
@@ -1,3 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIICnTCCAYUCBgGFAJ9a7jANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdFeGFtcGxlMB4XDTIyMTIxMTA5NTcwMVoXDTMyMTIxMTA5NTg0MVowEjEQMA4GA1UEAwwHRXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJv17u7hBOhwsRmlylApsmRplV1qPrliFmiOenUZSYwdkAtIu9Cu00BBx6FqmUnaTrMzprrjw1Kv8ADifmeT4m4ICul+nClici29o0eVh9a3dbYUZoyruXEEPd3mWVCXebkTfqA7AI8hVGHXk9R23PakQdrGJHoe1QSH3Vk41NyQbYZ5+U4gvnQqmaMgrYFtubQsS4ZdqzrkG5Ry0OigpWjOGT6dnSB0/AttN7pIfnaBGzmgIcQzBrW3c/9qhNuUBAhP3AKwYt/HptOfFkh7atOqrksIelHyuLTqsuXSJ/vAEAuEib1ns8ggYWTTRI9ROvdoJ5kvVBzflSB5Cr10LrsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAmi2oHhClIZIl/dwLxwVFaLZ7ZcHMLcQjytxrhQhl9i/xIByQXH5DXHtsmg1HcX8BET3Hrm7McxIspBOzHBxZPGLJlZwZ5aVzI6ZwMvy49rR5tbQlRppzM3VkT10P1ccIT6Cx9PtgL9BcgiPkRyzmhq3z10Ayd2PnY0G8Z0Lc7Qc6sXz9+DCFM6GkkvECPLlEdlagtYdQAH2om2qPaj1GjYY+QgvAuRmO04Biu2E/zhMvEG0KH+OgSHf6dTrcUhk0+nl2QRs7kueakRvn+Z6VXkwkcBokNq4+Ka6z9YmimrRv/CiWoLKIcYknHaNaP/PZI6joDcg3IgxWLOLWNHxTGw==
-----END CERTIFICATE-----
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDlz0NWHyNGjVCR
-FXahaaxhrVTAmeViELJO3pUtiqpYwhxV+nqqRUfBa0KGYHA1bIuM41/OWwHQjwFt
-opH5OYTTsqXicdVkq+5rYP+tKdJv0+S4puEAQsiLUgEWLpVfSmBIoyGGnU4hUCUR
-NDySoo5cjmevRUbd5Rvt76hOcYEHPmQOfT3se3wf0fY1sDkcUTK82UAz+3LypLzp
-atd5keVmwkJC1xtJ+hXdvwL9u0zRD/IJCE1JZK7+w5CqB3AUaVBiwbqHfgvxjPWm
-WF8bZSErciJM9u7pbFO/lXTcpqRZBC/r80a6bVv0tAtEU+MSgWxXgPqQsIKCDHib
-JwWgD9jpAgMBAAECggEBAK3xbFFSbjvnmJTIPyu7tYuVS7Igijvo0V3bIeT/sSJP
-gm0dkx0wJTjke80ET8pQJ2xzab/iqIP4yib2xzBx9fTaoq68ZL23WVYTbFLgdfTI
-2LVfMq0k33B8mG/2wH8I58nzF9wxUsLqS7Qy6qo+uiyaaSaD9DjeQn6dSLJfPT+B
-7cG1lKJVnpMEmjCc8b7x7jB2wMIuGVHbNEm+FRe94S8wm+psb6q7eG7JF2PDqsJp
-Hm+s0jhjwICS4rSTJ9gsg4YNAHx/xnWJn6nZiXh+mu5Irhb2kEQuE1xX1Fhy5GBI
-qqij2kFAqjn8PZ+RMsH43ITTf17eVq/lMkqcaHJtwgECgYEA8tutP46emqtLgDnp
-F82tFweQ+luQqohNcaIg4SOIh7eAik15lWYSYSSzsIpBcM9aVJ/ZdCrI9DD/Ba/n
-jUfoSsPo8PYy59zuGaheUyiQpUva2NNUSGkwQ4aT5aVVyn0cksCCq3ZoQ8wmu1aK
-JKgzRtQhkZMWOG8aJ+ie1s/PIKkCgYEA8j7TM6w1CELI6j/Xsb9VUr7m/GsU76CN
-W4eu3yOq6KSkXw8RveYzcHxdyP1TNn10e0n21BjYCKr001q+xgfwUMYcxxpwi+H2
-RXxyDwjXHmw5VVDXXH8uGHUFC2iYRENKTGmRV4EWc+XnRYk7O41/nsxMqPeBENhT
-cfMAeZa23kECgYA/kwozTR5v1s+Y7Y/7Tzg0gyKMp1OjkLLVQF/jD+45uOvJSKa/
-WU0OaREw8cBXy7AV3xKJunmIkxrvXjD7ZwuEJuzfx1NkJw2dYdnvYvsailTr1caG
-fiLISn6E61cd/spwED0krYZ12Qd6mxjmp7FkpTt0ZFC4zTzHnbmW+id6oQKBgGDB
-NxosbgIeqqDlXwFfqnSiSyAGpRYQymUEjJQTavAA0qYlHrD6gREsm0jr5ZCeCygz
-IqMUSTUtExxX4lq2UQXyGwxrQwib+AFI80WOAl3kXAH3iA0pvv+Fvb4QyMB7H/Hl
-OGf65zzjVrwvU7k1iwOiFfxm3uYbgTjCFi56RBABAoGBAMpRrYBQ4qfVLtIMqnXH
-xSPMN109PpG74ooyDSmnQutqKx+cnz6PWid+gK/KKZKdh5DG/ScVFCHGy+YqImnA
-ein9E7+uV6mbOzMnQGKm2Q5vbuG/UWY7bLVoxMN0XS1PTMk/fCC75l1gX1BsO1UX
-mBctbrmbnZ3Of6966dUuGXnS
-----END PRIVATE KEY-----
@@ -1,17 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIICvjCCAaYCCQDS+w+GXVpJsDANBgkqhkiG9w0BAQsFADAhMQswCQYDVQQGEwJE
-RTESMBAGA1UECgwJZGV2LmxvY2FsMB4XDTIyMTIxMDA1MjgxMloXDTIzMDEwOTA1
-MjgxMlowITELMAkGA1UEBhMCREUxEjAQBgNVBAoMCWRldi5sb2NhbDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXPQ1YfI0aNUJEVdqFprGGtVMCZ5WIQ
-sk7elS2KqljCHFX6eqpFR8FrQoZgcDVsi4zjX85bAdCPAW2ikfk5hNOypeJx1WSr
-7mtg/60p0m/T5Lim4QBCyItSARYulV9KYEijIYadTiFQJRE0PJKijlyOZ69FRt3l
-G+3vqE5xgQc+ZA59Pex7fB/R9jWwORxRMrzZQDP7cvKkvOlq13mR5WbCQkLXG0n6
-Fd2/Av27TNEP8gkITUlkrv7DkKoHcBRpUGLBuod+C/GM9aZYXxtlIStyIkz27uls
-U7+VdNympFkEL+vzRrptW/S0C0RT4xKBbFeA+pCwgoIMeJsnBaAP2OkCAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAOJ3+a1d06LN83gh3iNEvwWNudKVPi7MvyltW2WVB
-zQBoN2wCYC0crl7PRxXqACvpw2nE2qZaJ0KrrbVWUVMf2lAwRKk4g2F3WcwBjqak
-WwWEgIDuocLt1WX5nHbI6hb9E2jAwa8wpYbAiRQF5HnZGxI+1ZXKROZvhOPIiAVT
-v4jTPGr5lgxJ1lKqnVRfKIHZlPWPFGTmuwSkuq+9lwqp/HdCOIiV54c5yi0XBMvE
-jLhqoE5cxSVNswLF7thD7B2E1NTpyH83Z7rHtK/HDHinUVfOTKhnt15JAf2I2zwh
-9HErW/Bz4zQlmmBL0uMpgOjTix9h55p2JMuM7/Bd7ng2Dg==
-----END CERTIFICATE-----
@@ -1,20 +0,0 @@
-# Hook scripts
-
-Scripts in this directory will be picked up by the docker containers
-automatically. They can be used for automating setup specific to a developers
-use cases
-
- For all Nextcloud containers:
-    - before-install.sh
-    - after-install.sh
-
-
-## Example for before-start.sh
-```bash
-#!/bin/bash
-
-echo "🤖 triggered hook before-start.sh"
-env
-export OC_PASS="mycustomuser"
-occ user:add --password-from-env mycustomuser
-```
@@ -7,8 +7,8 @@ services:
  proxy:
    image: ghcr.io/juliushaertl/nextcloud-dev-nginx:latest
    ports:
-      - "${PROXY_PORT_HTTP:-80}:80"
-      - "${PROXY_PORT_HTTPS:-443}:443"
+      - "80:80"
+      - "443:443"
    volumes:
      - /var/run/docker.sock:/tmp/docker.sock:ro
      - ./data/ssl/:/etc/nginx/certs
@@ -35,12 +35,7 @@ services:
          - stable23${DOMAIN_SUFFIX}
          - stable24${DOMAIN_SUFFIX}
          - stable25${DOMAIN_SUFFIX}
-          - stable26${DOMAIN_SUFFIX}
-          - stable27${DOMAIN_SUFFIX}
-          - stable28${DOMAIN_SUFFIX}
-          - mail${DOMAIN_SUFFIX}
          - collabora${DOMAIN_SUFFIX}
-          - codedev${DOMAIN_SUFFIX}
          - onlyoffice${DOMAIN_SUFFIX}
          - proxy${DOMAIN_SUFFIX}
          - hpb${DOMAIN_SUFFIX}
@@ -52,9 +47,6 @@ services:
          - lookup${DOMAIN_SUFFIX}
          - elasticsearch${DOMAIN_SUFFIX}
          - elasticsearch-ui${DOMAIN_SUFFIX}
-          - pgadmin${DOMAIN_SUFFIX}
-          - phpmyadmin${DOMAIN_SUFFIX}
-          - talk-signaling${DOMAIN_SUFFIX}

  haproxy:
    image: haproxy
@@ -69,7 +61,7 @@ services:
    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
      SQL: ${SQL:-mysql}
-      NEXTCLOUD_AUTOINSTALL: ${NEXTCLOUD_AUTOINSTALL:-YES}
+      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
      VIRTUAL_HOST: "nextcloud${DOMAIN_SUFFIX}"
@@ -77,23 +69,21 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
      BLACKFIRE_CLIENT_ID:
      BLACKFIRE_CLIENT_TOKEN:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${REPO_PATH_SERVER}:/var/www/html'
-      - '${REPO_PATH_SERVER}/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - data:/var/www/html/data
      - config:/var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -102,19 +92,17 @@ services:
    environment:
      SQL: 'mysql'
      VIRTUAL_HOST: "nextcloud2${DOMAIN_SUFFIX}"
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${REPO_PATH_SERVER}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    ports:
      - "${PORTBASE:-800}1:80"
    depends_on:
-      - database-${SQL}
+      - database-mysql
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -123,18 +111,16 @@ services:
    environment:
      SQL: ${SQL:-mysql}
      VIRTUAL_HOST: "nextcloud3${DOMAIN_SUFFIX}"
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${REPO_PATH_SERVER}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./docker/configs/config.php:/var/www/html/config/writable.config.php:ro
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    depends_on:
-      - database-${SQL}
+      - database-mysql
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -148,22 +134,21 @@ services:
      VIRTUAL_HOST: stable16${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable16:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable16/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -177,22 +162,21 @@ services:
      VIRTUAL_HOST: stable17${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable17:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable17/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -206,22 +190,21 @@ services:
      VIRTUAL_HOST: stable18${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable18:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable18/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -235,22 +218,21 @@ services:
      VIRTUAL_HOST: stable19${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable19:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable19/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -264,22 +246,21 @@ services:
      VIRTUAL_HOST: stable20${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable20:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable20/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -293,23 +274,21 @@ services:
      VIRTUAL_HOST: stable21${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable21:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable21/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -323,23 +302,21 @@ services:
      VIRTUAL_HOST: stable22${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable22:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable22/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -353,23 +330,21 @@ services:
      VIRTUAL_HOST: stable23${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable23:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable23/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -383,23 +358,21 @@ services:
      VIRTUAL_HOST: stable24${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable24:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable24/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -413,212 +386,47 @@ services:
      VIRTUAL_HOST: stable25${DOMAIN_SUFFIX}
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
    volumes:
      - '${STABLE_ROOT_PATH}/stable25:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable25/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
      - ./data/shared:/shared
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - database-${SQL}
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
-      - ${PROXY_SERVICE:-proxy}
    extra_hosts:
      - host.docker.internal:host-gateway

-  stable26:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
-    environment:
-      SQL: ${SQL:-mysql}
-      NEXTCLOUD_AUTOINSTALL: "YES"
-      NEXTCLOUD_AUTOINSTALL_APPS:
-      WITH_REDIS: "YES"
-      VIRTUAL_HOST: stable26${DOMAIN_SUFFIX}
-      ADDITIONAL_APPS_PATH:
-      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
-    volumes:
-      - '${STABLE_ROOT_PATH}/stable26:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable26/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
-      - /var/www/html/data
-      - /var/www/html/config
-      - /var/www/html/apps-writable
-      - ./data/skeleton/:/skeleton
-      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
-      - ./data/shared:/shared
-    depends_on:
-      - database-${SQL}
-      - redis
-      - mail
-      - ${PROXY_SERVICE:-proxy}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
-  stable27:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
-    environment:
-      SQL: ${SQL:-mysql}
-      NEXTCLOUD_AUTOINSTALL: "YES"
-      NEXTCLOUD_AUTOINSTALL_APPS:
-      WITH_REDIS: "YES"
-      VIRTUAL_HOST: stable27${DOMAIN_SUFFIX}
-      ADDITIONAL_APPS_PATH:
-      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
-    volumes:
-      - '${STABLE_ROOT_PATH}/stable27:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable27/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
-      - /var/www/html/data
-      - /var/www/html/config
-      - /var/www/html/apps-writable
-      - ./data/skeleton/:/skeleton
-      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
-      - ./data/shared:/shared
-    depends_on:
-      - database-${SQL}
-      - redis
-      - mail
-      - ${PROXY_SERVICE:-proxy}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
-  stable28:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
-    environment:
-      SQL: ${SQL:-mysql}
-      NEXTCLOUD_AUTOINSTALL: "YES"
-      NEXTCLOUD_AUTOINSTALL_APPS:
-      WITH_REDIS: "YES"
-      VIRTUAL_HOST: stable28${DOMAIN_SUFFIX}
-      ADDITIONAL_APPS_PATH:
-      NEXTCLOUD_TRUSTED_DOMAINS:
-      PRIMARY: ${PRIMARY}
-      PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
-    volumes:
-      - '${STABLE_ROOT_PATH}/stable28:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable28/apps-extra:/var/www/html/apps-extra'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
-      - /var/www/html/data
-      - /var/www/html/config
-      - /var/www/html/apps-writable
-      - ./data/skeleton/:/skeleton
-      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
-      - ./data/shared:/shared
-    depends_on:
-      - database-${SQL}
-      - redis
-      - mail
-      - ${PROXY_SERVICE:-proxy}
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
-  database-sqlite:
-    image: rwgrim/docker-noop
-
  database-mysql:
-    image: mariadb:10.6
+    image: mariadb:10.5
    environment:
      MYSQL_ROOT_PASSWORD: 'nextcloud'
      MYSQL_PASSWORD: 'nextcloud'
      MYSQL_USER: 'nextcloud'
      MYSQL_DATABASE: 'nextcloud'
-    command: [
-      '--wait_timeout=300',
-    ]
    ports:
      - "${PORTBASE:-800}2:3306"
    volumes:
      - mysql:/var/lib/mysql

-  database-mariadb-primary:
-    image: docker.io/bitnami/mariadb:10.6
-    ports:
-      - '3306'
-    volumes:
-      - 'mariadb_primary_data:/bitnami/mariadb'
-    environment:
-      - MARIADB_REPLICATION_MODE=master
-      - MARIADB_REPLICATION_USER=repl_user
-      - MARIADB_REPLICATION_PASSWORD=repl_password
-      - MARIADB_ROOT_PASSWORD=nextcloud
-      - MARIADB_USER=nextcloud
-      - MARIADB_PASSWORD=nextcloud
-      - MARIADB_DATABASE=nextcloud
-
-  database-mariadb-replica:
-    image: docker.io/bitnami/mariadb:10.6
-    ports:
-      - '3306'
-    depends_on:
-      - database-mariadb-primary
-    environment:
-      - MARIADB_REPLICATION_MODE=slave
-      - MARIADB_REPLICATION_USER=repl_user
-      - MARIADB_REPLICATION_PASSWORD=repl_password
-      - MARIADB_MASTER_HOST=database-mariadb-primary
-      - MARIADB_MASTER_PORT_NUMBER=3306
-      - MARIADB_MASTER_ROOT_PASSWORD=nextcloud
-      # This can be useful for testing but should be enabled only after a setup is completed
-      # - MARIADB_MASTER_DELAY=10
-
-  database-maxscale:
-    image: mariadb/maxscale:latest
-    depends_on:
-      - database-mariadb-primary
-      - database-mariadb-replica
-    volumes:
-      - './docker/maxscale/my-maxscale.cnf:/etc/maxscale.cnf.d/my-maxscale.cnf'
-    ports:
-      - '3306'
-
  database-postgres:
    image: postgres:latest
    environment:
-      POSTGRES_DB: nextcloud
      POSTGRES_PASSWORD: postgres
-    ports:
-      - "${PORTBASE:-800}2:5432"
+    expose:
+      - 5432
    volumes:
      - postgres:/var/lib/postgresql

-  database-oci:
-    image: ghcr.io/gvenzl/oracle-xe:18
-    environment:
-      ORACLE_PASSWORD: nextcloud
-      APP_USER: nextcloud
-      APP_USER_PASSWORD: nextcloud
-      ORACLE_DATABASE: nextcloud
-    ports:
-      - 1521:1521/tcp
-
-  pgadmin:
-    container_name: pgadmin_container
-    image: dpage/pgadmin4
-    environment:
-      VIRTUAL_HOST: "pgadmin${DOMAIN_SUFFIX}"
-      PGADMIN_DEFAULT_EMAIL: pgadmin4@nextcloud.local
-      PGADMIN_DEFAULT_PASSWORD: postgres
-      PGADMIN_CONFIG_SERVER_MODE: 'False'
-      PGADMIN_SERVER_JSON_FILE: /pgadmin4/config/servers.json
-      PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
-    volumes:
-      - "./data/pgadmin/config:/pgadmin4/config"
-    depends_on:
-      - ${PROXY_SERVICE:-proxy}
-
  redis:
-    image: redis:7
+    image: redis:6

  ldap:
    image: osixia/openldap
@@ -708,38 +516,23 @@ services:
      aliasgroup2: http://gs1${DOMAIN_SUFFIX}
      aliasgroup3: http://gs2${DOMAIN_SUFFIX}
      aliasgroup4: http://stable20${DOMAIN_SUFFIX}
-      aliasgroup5: http://stable24${DOMAIN_SUFFIX}
-      aliasgroup6: http://stable25${DOMAIN_SUFFIX}
-      aliasgroup7: http://stable26${DOMAIN_SUFFIX}
-      aliasgroup8: http://stable27${DOMAIN_SUFFIX}
-      aliasgroup9: http://stable28${DOMAIN_SUFFIX}
+      aliasgroup5: http://stable21${DOMAIN_SUFFIX}
+      aliasgroup6: http://stable22${DOMAIN_SUFFIX}
+      aliasgroup7: http://stable23${DOMAIN_SUFFIX}
+      aliasgroup8: http://stable24${DOMAIN_SUFFIX}
+      aliasgroup9: http://stable25${DOMAIN_SUFFIX}
      dictionaries: de_DE en_US en_GB
      username: admin
      password: admin
      VIRTUAL_HOST: collabora${DOMAIN_SUFFIX}
      VIRTUAL_PORT: 9980
      VIRTUAL_PROTO: http
-      server_name: collabora${DOMAIN_SUFFIX}
-      extra_params: "--o:ssl.enable=false --o:net.frame_ancestors=*${DOMAIN_SUFFIX} --o:home_mode.enable=true --o:ssl.termination=false ${COLLABORA_PARAMS:-}"
-
-  codedev:
-    privileged: true
-    build:
-      context: ./docker/codedev
-    environment:
-      VIRTUAL_HOST: "codedev${DOMAIN_SUFFIX}"
-      VIRTUAL_PORT: 9980
-    volumes:
-      - /Users/julius/repos/collaboraonline:/collabora
-    command: >
-      tail -f /dev/null
+      extra_params: "--o:ssl.enable=false --o:net.frame_ancestors=*${DOMAIN_SUFFIX}"

  onlyoffice:
-    image: onlyoffice/documentserver:latest
+    image: ${CONTAINER_ONLYOFFICE:-onlyoffice/documentserver:latest}
    environment:
      VIRTUAL_HOST: onlyoffice${DOMAIN_SUFFIX}
-      USE_UNAUTHORIZED_STORAGE: "true"
-      JWT_SECRET: secret
    expose:
      - '80'
    volumes:
@@ -750,10 +543,8 @@ services:
    image: minio/minio
    environment:
      VIRTUAL_HOST: minio${DOMAIN_SUFFIX}
-      VIRTUAL_PORT: 9001
      MINIO_ROOT_USER: nextcloud
      MINIO_ROOT_PASSWORD: nextcloud
-      MINIO_BROWSER_REDIRECT_URL: ${PROTOCOL}://minio${DOMAIN_SUFFIX}
    volumes:
      - objectstorage_minio:/data
    command: server /data --console-address :9001
@@ -761,7 +552,7 @@ services:
  elasticsearch:
    build:
      context: ./docker
-      dockerfile: elasticsearch/Dockerfile
+      dockerfile: Dockerfile.elasticsearch
    environment:
      - ELASTIC_PASSWORD=elastic
      - discovery.type=single-node
@@ -795,29 +586,30 @@ services:


  push:
-    image: ghcr.io/juliushaertl/nextcloud-dev-push:latest
+    image: icewind1991/notify_push
+    ports:
+      - '8191:80'
    environment:
      RUST_LOG: debug
      VIRTUAL_HOST: push${DOMAIN_SUFFIX}
-      VIRTUAL_PORT: 7867
-      DATABASE_URL: mysql://root:nextcloud@database-mysql/nextcloud
+      VIRTUAL_PORT: 8191
+      DATABASE_URL: mysql://nextcloud:nextcloud@master_database-mysql_1/nextcloud
      REDIS_URL: redis://redis
-      NEXTCLOUD_URL: http://nextcloud
+      NEXTCLOUD_URL: https://nextcloud.local.dev.bitgrid.net

  keycloak:
-    image: quay.io/keycloak/keycloak:23.0
+    image: ${CONTAINER_KEYCLOAK:-quay.io/keycloak/keycloak:15.0.1}
    expose:
      - 8080
    volumes:
-      - ./docker/configs/keycloak:/opt/keycloak/data/import
-    command: start-dev --import-realm
+      - ./docker/configs/keycloak:/tmp/keycloak
    environment:
      VIRTUAL_HOST: "keycloak${DOMAIN_SUFFIX}"
      VIRTUAL_PORT: 8080
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
+      KEYCLOAK_USER: admin
+      KEYCLOAK_PASSWORD: admin
      PROXY_ADDRESS_FORWARDING: "true"
-      KC_PROXY: edge
+      KEYCLOAK_IMPORT: /tmp/keycloak/realm-export.json

  av:
    image: mkodockx/docker-clamav:alpine
@@ -834,14 +626,14 @@ services:
      GS_MODE: master
    volumes:
      - '${STABLE_ROOT_PATH}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    depends_on:
-      - ${PROXY_SERVICE:-proxy}
-      - database-${SQL}
+      - proxy
+      - database-mysql
      - lookup
      - redis
      - mail
@@ -856,15 +648,15 @@ services:
      GS_MODE: slave
    volumes:
      - '${STABLE_ROOT_PATH}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    depends_on:
-      - ${PROXY_SERVICE:-proxy}
+      - proxy
      - portal
-      - database-${SQL}
+      - database-mysql
      - lookup
      - redis
      - mail
@@ -879,15 +671,15 @@ services:
      GS_MODE: slave
    volumes:
      - '${STABLE_ROOT_PATH}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    depends_on:
-      - ${PROXY_SERVICE:-proxy}
+      - proxy
      - portal
-      - database-${SQL}
+      - database-mysql
      - lookup
      - redis
      - mail
@@ -904,28 +696,12 @@ services:
      - host.docker.internal:host-gateway

  previews_hpb:
-    image: nextcloud/aio-imaginary:latest
+    image: h2non/imaginary
    ports:
      - "8088:8088"
    environment:
      - PORT=8088

-  talk-signaling:
-    image: strukturag/nextcloud-spreed-signaling:latest
-    environment:
-      VIRTUAL_HOST: "talk-signaling${DOMAIN_SUFFIX}"
-      HTTP_LISTEN: "0.0.0.0:80"
-      HASH_KEY: "11111111111111111111111111111111"
-      BLOCK_KEY: "22222222222222222222222222222222"
-      USE_JANUS: 1
-      JANUS_URL: "ws://talk-janus:8188"
-      SKIP_VERIFY: 1
-      BACKENDS_ALLOWALL: 1
-      BACKENDS_ALLOWALL_SECRET: "1234"
-      INTERNAL_SHARED_SECRET_KEY: "4567"
-
-  talk-janus:
-    image: ghcr.io/juliushaertl/nextcloud-dev-talk-janus:latest

 volumes:
  data:
@@ -941,7 +717,6 @@ volumes:
  smbhomes:
  elasticsearch_data:
  clam:
-  mariadb_primary_data:

 networks:
  default:
@@ -1,3 +1,3 @@
-FROM elasticsearch:7.17.14
+FROM elasticsearch:7.17.3

 RUN bin/elasticsearch-plugin install --batch ingest-attachment
@@ -3,4 +3,4 @@ FROM osixia/openldap:latest
 ENV LDAP_DOMAIN="planetexpress.com"
 ENV LDAP_BASE_DN="dc=planetexpress,dc=com"

-COPY ./ldap/seed /container/service/slapd/assets/config/bootstrap/ldif/custom
+COPY ./configs/ldap /container/service/slapd/assets/config/bootstrap/ldif/custom
@@ -1,11 +1,11 @@
-FROM ubuntu:22.04
+FROM ubuntu:20.04

 ENV DEBIAN_FRONTEND=noninteractive
 ENV DBPASSWD=abrakadabra

 ADD https://github.com/nextcloud/lookup-server/archive/master.zip /root/lookup-server.zip

-COPY lookupserver/entrypoint.sh /usr/sbin/
+COPY configs/lookupserver/entrypoint.sh /usr/sbin/

 RUN echo 'mariadb-server mysql-server/root_password password $DBPASSWD' | debconf-set-selections && \
    echo 'mariadb-server mysql-server/root_password_again password $DBPASSWD' | debconf-set-selections && \
@@ -30,8 +30,8 @@ RUN cd /root/ && \
    rm lookup-server.zip && \
    rm -Rf lookup-server-master

-COPY lookupserver/config.php /var/www/html/config
-COPY lookupserver/lookup.conf /etc/apache2/conf-available/
+COPY configs/lookupserver/config.php /var/www/html/config
+COPY configs/lookupserver/lookup.conf /etc/apache2/conf-available/

 RUN a2enmod rewrite && \
    a2enconf lookup && \
@@ -0,0 +1,5 @@
+FROM nginxproxy/nginx-proxy:latest
+RUN { \
+      echo 'server_tokens off;'; \
+      echo 'client_max_body_size 1024m;'; \
+    } > /etc/nginx/conf.d/my_proxy.conf
@@ -1,49 +1,63 @@
-FROM php:8.2-apache
+FROM php:8.1-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,49 +1,63 @@
 FROM php:7.1-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,49 +1,63 @@
 FROM php:7.2-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,49 +1,63 @@
 FROM php:7.3-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,49 +1,63 @@
 FROM php:7.4-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,49 +1,63 @@
 FROM php:8.0-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,49 +1,63 @@
 FROM php:8.1-apache

-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        libcurl4-openssl-dev \
+        libfreetype6-dev \
+        libicu-dev \
+        libjpeg-dev \
+        libldap2-dev \
+        libmcrypt-dev \
+        libmemcached-dev \
+        libpng-dev \
+        libpq-dev \
+        libxml2-dev \
+        libzip-dev \
+        libmagickwand-dev \
+        libmagickcore-6.q16-3-extra \
+        libsmbclient-dev \
+        && rm -rf /var/lib/apt/lists/*

-RUN chmod +x /usr/local/bin/install-php-extensions
+RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
+    docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
+    docker-php-ext-install \
+        exif \
+        gd \
+        intl \
+        ldap \
+        opcache \
+        pcntl \
+        pdo_mysql \
+        pdo_pgsql \
+        zip

-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug-^3.2 \
-    zip \
-    @composer
+RUN pecl install APCu; \
+    pecl install memcached; \
+    pecl install redis; \
+    pecl install xdebug; \
+    pecl install imagick; \
+    pecl install smbclient; \
+    pecl install mcrypt; \
+    \
+    docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        xdebug \
+        imagick \
+        smbclient; \
+	docker-php-source delete && \
+		rm -r /tmp/* /var/cache/*

 # dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
+    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
+        && rm -rf /var/lib/apt/lists/*

 # Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit

 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

@@ -65,29 +79,13 @@ ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
+    && apt-get install -y --no-install-recommends blackfire-php blackfire \
+    && printf "blackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini \
    && rm -rf /var/lib/apt/lists/*

 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf

-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
+RUN a2enmod rewrite

 ENV WEBROOT /var/www/html
 WORKDIR /var/www/html
@@ -95,6 +93,5 @@ WORKDIR /var/www/html
 ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
 CMD ["apache2-foreground"]

-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
+ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/config.php configs/redis.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -0,0 +1,4 @@
+.PHONY: Dockerfile.*
+Dockerfile.*:
+	NAME=$$(echo $@ | sed 's/^.*\.//'); echo "=> Building image $$NAME"; \
+	(docker build -t ghcr.io/juliushaertl/nextcloud-dev-$$NAME:latest -f Dockerfile.$$NAME .)
@@ -1,44 +1,13 @@
 #!/bin/bash
 # shellcheck disable=SC2181

-# set -o xtrace
-
 DOMAIN_SUFFIX=".$(echo "$VIRTUAL_HOST" | cut -d '.' -f2-)"
-IS_STANDALONE=$([ -z "$VIRTUAL_HOST" ] && echo "true" )

 indent() { sed 's/^/   /'; }

-# Prepare waiting page during auto installation
-cp /root/installing.html /var/www/html/installing.html
-
-tee /etc/apache2/conf-enabled/install.conf << EOF
-<Directory "/var/www/html">
-AllowOverride None
-RewriteEngine On
-RewriteBase /
-RewriteCond %{REQUEST_URI} !/installing.html$
-RewriteRule .* /installing.html [L]
-</Directory>
-EOF
-
-pkill -USR1 apache2
-
-output() {
-	echo "$@"
-	echo "$@" >> /var/www/html/installing.html
-}
-
-fatal() {
-	output "======================================================================================="
-	output "$@"
-	output "======================================================================================="
-	exit 1
-}
-
 OCC() {
-	output "occ" "$@"
 	# shellcheck disable=SC2068
-	sudo -E -u www-data php "$WEBROOT/occ" $@ | indent
+	sudo -E -u www-data "$WEBROOT/occ" $@ | indent
 }

 update_permission() {
@@ -46,70 +15,27 @@ update_permission() {
 	chown -R www-data:www-data "$WEBROOT"/data
 	chown www-data:www-data "$WEBROOT"/config
 	chown www-data:www-data "$WEBROOT"/config/config.php 2>/dev/null
-
-	if [ -f /shared/config.php ]
-	then
-		ln -sf /shared/config.php "$WEBROOT"/config/user.config.php
-	fi
-}
-
-configure_xdebug_mode() {
-	if [ -n "$PHP_XDEBUG_MODE" ]
-	then
-		sed -i "s/^xdebug.mode\s*=.*/xdebug.mode = ${PHP_XDEBUG_MODE//\//_}/" /usr/local/etc/php/conf.d/xdebug.ini
-		unset PHP_XDEBUG_MODE
-	else
-		echo "⚠ No value for PHP_XDEBUG_MODE was found. Not updating the setting."
-	fi
 }

 wait_for_other_containers() {
-	output "⌛ Waiting for other containers"
-	retry_with_timeout() {
-		local cmd=$1
-		local timeout=$2
-		local error_message=$3
-		local START_TIME=$SECONDS
-
-		while ! bash -c "$cmd"; do
-			if [ "$((SECONDS - START_TIME))" -ge "$timeout" ]; then
-				fatal "$error_message"
-			fi
-			sleep 2
-		done
-	}
-
-	case "$SQL" in
-		"mysql" | "mariadb-replica")
-			output " - MySQL"
-			retry_with_timeout "(echo > /dev/tcp/database-$SQL/3306) 2>/dev/null" 30 "⚠ Unable to connect to the MySQL server"
-			sleep 2
-			;;
-		"pgsql")
-			retry_with_timeout "(echo > /dev/tcp/database-postgres/5432) 2>/dev/null" 30 "⚠ Unable to connect to the PostgreSQL server"
-			sleep 2
-			;;
-		"maxscale")
-			for node in database-mariadb-primary database-mariadb-replica; do
-				echo " - Waiting for $node"
-				retry_with_timeout "(echo > /dev/tcp/$node/3306) 2>/dev/null" 30 "⚠ Unable to reach to the $node"
-				retry_with_timeout "mysql -u root -pnextcloud -h $node -e 'SELECT 1' 2>/dev/null" 30 "⚠ Unable to connect to the $node"
-				echo "✅"
-			done
-			;;
-		*)
-			fatal 'Not implemented'
-			;;
-	esac
-	[ $? -eq 0 ] && output "✅ Database server ready"
+	echo "⌛ Waiting for other containers"
+	if [ "$SQL" = "mysql" ]
+	then
+		echo " - MySQL"
+		while ! timeout 1 bash -c "(echo > /dev/tcp/database-mysql/3306) 2>/dev/null"; do sleep 2; done
+		[ $? -ne 0 ] && echo "⚠ Unable to connect to the MySQL server"
+	fi
+	if [ "$SQL" = "pgsql" ]
+	then
+		while ! timeout 1 bash -c "(echo > /dev/tcp/database-postgres/5432) 2>/dev/null"; do sleep 2; done
+		[ $? -ne 0 ] && echo "⚠ Unable to connect to the PostgreSQL server"
+	fi
+	sleep 2
+	[ $? -eq 0 ] && echo "✅ Database server ready"
 }

 configure_gs() {
-	OCC config:system:set lookup_server --value=""
-
-	if [[ "$IS_STANDALONE" = "true" ]]; then
-		return 0
-	fi
+	OCC config:system:set lookup_server --value ""

 	get_protocol
 	LOOKUP_SERVER="${PROTOCOL}://lookup${DOMAIN_SUFFIX}/index.php"
@@ -139,13 +65,9 @@ configure_gs() {
 }

 configure_ldap() {
-	if [[ "$IS_STANDALONE" = "true" ]]; then
-		return 0
-	fi
-
 	timeout 5 bash -c 'until echo > /dev/tcp/ldap/389; do sleep 0.5; done' 2>/dev/null
 	if [ $? -eq 0 ]; then
-		output "LDAP server available"
+		echo "LDAP server available"
 		export LDAP_USER_FILTER="(|(objectclass=inetOrgPerson))"

 		OCC app:enable user_ldap
@@ -174,36 +96,38 @@ configure_ldap() {
 }

 configure_oidc() {
-	if [[ "$IS_STANDALONE" = "true" ]]; then
-		return 0
-	fi
 	OCC app:enable user_oidc
 	get_protocol
-	OCC user_oidc:provider Keycloak -c nextcloud -s 09e3c268-d8bc-42f1-b7c6-74d307ef5fde -d "$PROTOCOL://keycloak${DOMAIN_SUFFIX}/realms/Example/.well-known/openid-configuration"
+	OCC user_oidc:provider Keycloak -c nextcloud -s 09e3c268-d8bc-42f1-b7c6-74d307ef5fde -d "$PROTOCOL://keycloak.local.dev.bitgrid.net/auth/realms/Example/.well-known/openid-configuration"
 }

-PROTOCOL="${PROTOCOL:-http}"
+PROTOCOL=""
 get_protocol() {
-	if [[ "$IS_STANDALONE" = "true" ]]; then
-		PROTOCOL=http
-		return 0
-	fi
+	if [[ "$PROTOCOL" == "" ]]; then
+		echo " Detecting SSL..."
+		timeout 5 bash -c 'until echo > /dev/tcp/proxy/443; do sleep 0.5; done' 2>/dev/null
+		if [ $? -eq 0 ]; then
+			echo "🔑 SSL proxy available, configuring proxy settings"
+			PROTOCOL=https
+		else
+			echo "🗝 No SSL proxy, removing overwriteprotocol"
+			PROTOCOL=http
+		fi
+    fi
 }

 configure_ssl_proxy() {
-	if [[ "$IS_STANDALONE" = "true" ]]; then
-		return 0
-	fi
-
 	get_protocol
 	if [[ "$PROTOCOL" == "https" ]]; then
-		echo "🔑 SSL proxy available, configuring overwrite.cli.url accordingly"
-		OCC config:system:set overwrite.cli.url --value "https://$VIRTUAL_HOST" &
+		echo "🔑 SSL proxy available, configuring proxy settings"
+		OCC config:system:set overwriteprotocol --value https
+		OCC config:system:set overwrite.cli.url --value "https://$VIRTUAL_HOST"
 	else
-		echo "🗝 No SSL proxy, configuring overwrite.cli.url accordingly"
-		OCC config:system:set overwrite.cli.url --value "http://$VIRTUAL_HOST" &
+		echo "🗝 No SSL proxy, removing overwriteprotocol"
+		OCC config:system:delete overwriteprotocol
+		OCC config:system:set overwrite.cli.url --value "http://$VIRTUAL_HOST"
+
 	fi
-	update-ca-certificates
 }


@@ -215,62 +139,60 @@ configure_add_user() {

 install() {
 	DBNAME=$(echo "$VIRTUAL_HOST" | cut -d '.' -f1)
-	SQLHOST="database-$SQL"
 	echo "database name will be $DBNAME"

+	if [ "$SQL" = "mysql" ]
+	then
+		cp /root/autoconfig_mysql.php "$WEBROOT"/config/autoconfig.php
+		sed -i "s/dbname' => 'nextcloud'/dbname' => '$DBNAME'/" "$WEBROOT/config/autoconfig.php"
+		SQLHOST=database-mysql
+	fi
+
+	if [ "$SQL" = "pgsql" ]
+	then
+		cp /root/autoconfig_pgsql.php "$WEBROOT"/config/autoconfig.php
+		sed -i "s/dbname' => 'nextcloud'/dbname' => '$DBNAME'/" "$WEBROOT/config/autoconfig.php"
+		SQLHOST=database-postgres
+	fi
+
+	if [ "$SQL" = "oci" ]
+	then
+		cp /root/autoconfig_oci.php "$WEBROOT"/config/autoconfig.php
+	fi
+
+	# We copy the default config to the container
+	cp /root/config.php "$WEBROOT"/config/config.php
+	chown -R www-data:www-data "$WEBROOT"/config/config.php
+
+	update_permission
+
 	USER="admin"
 	PASSWORD="admin"

-	run_hook_before_install
-
-	output "🔧 Starting auto installation"
+	echo "🔧 Starting auto installation"
 	if [ "$SQL" = "oci" ]; then
-		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name=xe --database-host="$SQLHOST" --database-user=system --database-pass=oracle
+		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name=xe --database-host=$SQLHOST --database-user=system --database-pass=oracle
 	elif [ "$SQL" = "pgsql" ]; then
-		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name="$DBNAME" --database-host="$SQLHOST" --database-user=postgres --database-pass=postgres
+		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name="$DBNAME" --database-host=$SQLHOST --database-user=postgres --database-pass=postgres
 	elif [ "$SQL" = "mysql" ]; then
-		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name="$DBNAME" --database-host="$SQLHOST" --database-user=root --database-pass=nextcloud
-	elif [ "$SQL" = "mariadb-replica" ]; then
-		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="mysql" --database-name="$DBNAME" --database-host="database-mariadb-primary" --database-user=root --database-pass=nextcloud
-	elif [ "$SQL" = "maxscale" ]; then
-		sleep 10
-		# FIXME only works for main container as maxscale does not pass root along
-		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="mysql" --database-name="$DBNAME" --database-host="database-mariadb-primary" --database-user=nextcloud --database-pass=nextcloud
-		OCC config:system:set dbhost --value="database-maxscale"
-		OCC config:system:set dbuser --value="nextcloud"
+		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL" --database-name="$DBNAME" --database-host=$SQLHOST --database-user=root --database-pass=nextcloud
 	else
 		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL"
 	fi;

-	output "🔧 Server installed"
-
-	output "🔧 Provisioning apps"
 	OCC app:disable password_policy

 	for app in $NEXTCLOUD_AUTOINSTALL_APPS; do
-		APP_ENABLED=$(OCC app:enable "$app")
-		output "$APP_ENABLED"
-		WAIT_TIME=0
-		until [[ $WAIT_TIME -eq ${NEXTCLOUD_AUTOINSTALL_APPS_WAIT_TIME:-0} ]] || [[ $APP_ENABLED =~ ${app}.*enabled$ ]]
-		do
-			# if app is not installed pause for 1 seconds and enable again
-			output "🔄 retrying"
-			sleep 1
-			APP_ENABLED=$(OCC app:enable "$app")
-			output "$APP_ENABLED"
-			((WAIT_TIME++))
-		done
+		OCC app:enable "$app"
 	done
 	configure_gs
 	configure_ldap
 	configure_oidc

-	output "🔧 Finetuning the configuration"
 	if [ "$WITH_REDIS" != "NO" ]; then
 		cp /root/redis.config.php "$WEBROOT"/config/
-	else
-		cp /root/apcu.config.php "$WEBROOT"/config/
 	fi
+	OCC user:setting admin settings email admin@example.net

 	# Setup domains
 	# localhost is at index 0 due to the installation
@@ -285,14 +207,8 @@ install() {
 			NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX + 1))
 		done
 	fi
-
-	TRUSTED_PROXY=$(ip a show type veth | awk '/scope global/ {print $2}')
-	OCC config:system:set trusted_proxies 0 --value="$TRUSTED_PROXY"
-
 	configure_ssl_proxy

-	output "🔧 Preparing cron job"
-
 	# Setup initial configuration
 	OCC background:cron

@@ -302,10 +218,9 @@ install() {
 	# run custom shell script from nc root
 	# [ -e /var/www/html/nc-dev-autosetup.sh ] && bash /var/www/html/nc-dev-autosetup.sh

-	output "🔧 Setting up users and LDAP in the background"
-	OCC user:setting admin settings email admin@example.net &
+	echo "🔧 Setting up users and LDAP in the background"
 	INSTANCENAME=$(echo "$VIRTUAL_HOST" | cut -d '.' -f1)
-	configure_add_user "${INSTANCENAME:-nextcloud}" &
+	configure_add_user "$INSTANCENAME" &
 	configure_add_user user1 &
 	configure_add_user user2 &
 	configure_add_user user3 &
@@ -316,26 +231,9 @@ install() {
 	configure_add_user john &
 	configure_add_user alice &
 	configure_add_user bob &
+	configure_ldap &

-	run_hook_after_install
-
-	output "🚀 Finished setup using $SQL database…"
-}
-
-run_hook_before_install() {
-	[ -e /shared/hooks/before-install.sh ] && bash /shared/hooks/before-install.sh
-}
-
-run_hook_after_install() {
-	[ -e /shared/hooks/after-install.sh ] && bash /shared/hooks/after-install.sh
-}
-
-run_hook_before_start() {
-	[ -e /shared/hooks/before-start.sh ] && bash /shared/hooks/before-start.sh
-}
-
-run_hook_after_start() {
-	[ -e /shared/hooks/after-start.sh ] && bash /shared/hooks/after-start.sh
+	echo "🚀 Finished setup using $SQL database…"
 }

 add_hosts() {
@@ -345,81 +243,30 @@ add_hosts() {

 setup() {
 	update_permission
-	configure_xdebug_mode
 	STATUS=$(OCC status)
 	if [[ "$STATUS" = *"installed: true"* ]] || [[ ! -f $WEBROOT/config/config.php ]]
 	then
-		output "🚀 Nextcloud already installed ... skipping setup"
+		echo "🚀 Nextcloud already installed ... skipping setup"

 		# configuration that should be applied on each start
 		configure_ssl_proxy
 	else
-		# We copy the default config to the container
-		cp /root/default.config.php "$WEBROOT"/config/config.php
-		chown -R www-data:www-data "$WEBROOT"/config/config.php
-
-		mkdir -p "$WEBROOT/apps-extra"
-		mkdir -p "$WEBROOT/apps-shared"
-
-		update_permission
-
 		if [ "$NEXTCLOUD_AUTOINSTALL" != "NO" ]
 		then
 			add_hosts
 			install
-		else
-			touch "${WEBROOT}/config/CAN_INSTALL"
 		fi
 	fi
-}
-check_source() {
-	FILE=/var/www/html/status.php
-	if [ -f "$FILE" ]; then
-		output "Server source is mounted, continuing"
-	else
-		# Only autoinstall when not running in docker-compose
-		if [ -n "$NEXTCLOUD_AUTOINSTALL_APPS" ] && [ ! -f "$WEBROOT"/config/version.php ]
-		then
-			output "======================================================================================="
-			output " 🚨 Could not find a valid Nextcloud source in $WEBROOT                                "
-			output " Double check your REPO_PATH_SERVER and STABLE_ROOT_PATH environment variables in .env "
-			output "======================================================================================="

-			exit 1
-		fi
-
-		output "Server source is not present, fetching ${SERVER_BRANCH:-master}"
-		git clone --depth 1 --branch "${SERVER_BRANCH:-master}" https://github.com/nextcloud/server.git /tmp/server
-		(cd /tmp/server && git submodule update --init)
-		output "Cloning additional apps"
-		git clone --depth 1 --branch "${SERVER_BRANCH:-master}" https://github.com/nextcloud/viewer.git /tmp/server/apps/viewer
-
-		# shallow clone of submodules https://stackoverflow.com/questions/2144406/how-to-make-shallow-git-submodules
-		git config -f .gitmodules submodule.3rdparty.shallow true
-		(cd /tmp/server && git submodule update --init)
-		rsync -a --chmod=755 --chown=www-data:www-data /tmp/server/ /var/www/html
-		chown www-data: /var/www/html
-		chown www-data: /var/www/html/.htaccess
-	fi
-	output "Nextcloud server source is ready"
 }

-(
-	check_source
-	wait_for_other_containers
-	setup
-	run_hook_before_start
-	rm /etc/apache2/conf-enabled/install.conf
-	rm -f /var/www/html/installing.html
-	pkill -USR1 apache2
-	run_hook_after_start
-) &
+wait_for_other_containers
+setup

-touch /var/log/cron/nextcloud.log "$WEBROOT"/data/nextcloud.log /var/log/xdebug.log
-chown www-data /var/log/xdebug.log
+touch /var/log/cron/nextcloud.log "$WEBROOT"/data/nextcloud.log

 echo "📰 Watching log file"
-tail --follow "$WEBROOT"/data/nextcloud.log /var/log/cron/nextcloud.log /var/log/xdebug.log &
+tail --follow "$WEBROOT"/data/nextcloud.log /var/log/cron/nextcloud.log &

 echo "⌚ Starting cron"
 /usr/sbin/cron -f &
@@ -1 +0,0 @@
-FROM collabora/code
@@ -1,21 +0,0 @@
-FROM --platform=linux/amd64 ubuntu:22.04
-
-RUN apt update && \
-    apt install -y git build-essential zip ccache junit4 libkrb5-dev nasm graphviz python3 python3-dev qtbase5-dev libkf5coreaddons-dev libkf5i18n-dev libkf5config-dev libkf5windowsystem-dev libkf5kio-dev autoconf libcups2-dev libfontconfig1-dev gperf default-jdk doxygen libxslt1-dev xsltproc libxml2-utils libxrandr-dev libx11-dev bison flex libgtk-3-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev ant ant-optional libnss3-dev libavahi-client-dev libxt-dev \
-        sudo git vim wget curl \
-        dialog \
-        libpoco-dev python3-polib libcap-dev npm \
-		libpam-dev wget git build-essential libtool \
-		libcap2-bin python3-lxml libpng-dev libcppunit-dev \
-		pkg-config fontconfig \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN npm install -g sass
-
-RUN adduser --quiet --disabled-password --gecos '' --system --group --home /collabora cool
-RUN adduser cool sudo
-RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-
-EXPOSE 9980
-
-USER cool
@@ -1,3 +0,0 @@
-<?php $CONFIG=[
-  'memcache.local' => '\\OC\\Memcache\\APCu',
-];
@@ -0,0 +1,40 @@
+<?php $CONFIG=[
+	'debug' => true,
+	'profiler' => true,
+	'apps_paths' => 
+	array (
+		0 => 
+		array (
+			'path' => '/var/www/html/apps',
+			'url' => '/apps',
+			'writable' => false,
+		),
+		1 => 
+		array (
+			'path' => '/var/www/html/apps-extra',
+			'url' => '/apps-extra',
+			'writable' => false,
+		),
+		2 => 
+		array (
+			'path' => '/var/www/html/apps-writable',
+			'url' => '/apps-writable',
+			'writable' => true,
+		),
+	),
+
+	// allow local remote senders
+	'allow_local_remote_servers' => true,
+
+	// config for mailhog
+	'mail_from_address' => 'admin',
+	'mail_smtpmode' => 'smtp',
+	'mail_sendmailmode' => 'smtp',
+	'mail_domain' => 'localhost',
+	'mail_smtphost' => 'mail',
+	'mail_smtpport' => '1025',
+
+	'skeletondirectory' => '/skeleton',
+
+	//PLACEHOLDER
+];
@@ -1,69 +0,0 @@
-<?php
-$hostname = gethostname();
-$primary = isset($_ENV['PRIMARY']) ? $_ENV['PRIMARY'] : '';
-$virtualHost = isset($_ENV['VIRTUAL_HOST']) ? $_ENV['VIRTUAL_HOST'] : '';
-$virtualHost = explode(".", $virtualHost);
-if (count($virtualHost) > 0) {
-	$hostname = array_shift($virtualHost);
-}
-
-$CONFIG=[
-	'debug' => true,
-	'profiler' => true,
-	'apps_paths' => 
-	array (
-		0 => 
-		array (
-			'path' => '/var/www/html/apps',
-			'url' => '/apps',
-			'writable' => false,
-		),
-		1 => 
-		array (
-			'path' => '/var/www/html/apps-extra',
-			'url' => '/apps-extra',
-			'writable' => false,
-		),
-		2 => 
-		array (
-			'path' => '/var/www/html/apps-shared',
-			'url' => '/apps-shared',
-			'writable' => false,
-		),
-		3 =>
-		array (
-			'path' => '/var/www/html/apps-writable',
-			'url' => '/apps-writable',
-			'writable' => true,
-		),
-	),
-
-	// allow local remote senders
-	'allow_local_remote_servers' => true,
-
-	// config for mailhog
-	'mail_from_address' => 'admin',
-	'mail_smtpmode' => 'smtp',
-	'mail_sendmailmode' => 'smtp',
-	'mail_domain' => 'localhost',
-	'mail_smtphost' => 'mail',
-	'mail_smtpport' => '1025',
-
-	'skeletondirectory' => '/skeleton',
-
-	'setup_create_db_user' => false,
-
-	'debug' => true,
-	'loglevel' => 2,
-
-	// 'htaccess.RewriteBase' => '/',
-	'log_query' => false,
-	'query_log_file' => '/shared/log/querylog-' . $hostname .'.log',
-	'query_log_file_requestid' => 'yes',
-
-	'diagnostics.logging' => false,
-	'diagnostics.logging.threshold' => 0,
-	'log.condition' => [
-        'apps' => ['diagnostics', 'admin_audit'],
-	],
-];
@@ -1,22 +1,14 @@
-; off develop debug gcstats profile trace
-xdebug.mode = off
+ # off develop debug gcstats profile trace
+xdebug.mode = debug
 xdebug.idekey=PHPSTORM
 xdebug.trace_output_name=trace.%R.%u
 xdebug.profiler_output_name=profile.%R.%u
-xdebug.output_dir=/shared/xdebug
+xdebug.output_dir=/shared

-xdebug.log = /var/log/xdebug.log
-xdebug.log_level = 1
-
-; Try to discover the client host, otherwise fall back to the docker host
+# Try to discover the client host, otherwise fall back to the docker host
 xdebug.discover_client_host=true
 xdebug.client_host=host.docker.internal

-; When you cannot specify a trigger, use "xdebug.start_with_request = yes" to autostart debugging for all requests
-; https://xdebug.org/docs/all_settings#start_with_request
-xdebug.start_with_request = trigger
-
-; Set xdebug.mode trace to use this
-; More details at https://derickrethans.nl/flamboyant-flamegraphs.html
-xdebug.trace_format=3
-xdebug.trace_output_name=xdebug.%R.%u
+# set this to autostart debugging e.g. if you cannot specify the trigger in the request
+# https://xdebug.org/docs/all_settings#start_with_request
+# xdebug.start_with_request = yes
@@ -1,52 +0,0 @@
-<?php
-// FIXME: Move everything except the last part to the containers
-// set the hostname to the VIRTUAL_HOST set for the docker container, otherwise fallback to the docker hostname
-$hostname = gethostname();
-$primary = isset($_ENV['PRIMARY']) ? $_ENV['PRIMARY'] : '';
-$virtualHost = isset($_ENV['VIRTUAL_HOST']) ? $_ENV['VIRTUAL_HOST'] : '';
-$virtualHost = explode(".", $virtualHost);
-if (count($virtualHost) > 0) {
-	$hostname = array_shift($virtualHost);
-}
-
-$CONFIG = [];
-if ($primary === 'minio') {
-	$CONFIG += [
-		'objectstore' =>
-		array (
-			'class' => 'OC\\Files\\ObjectStore\\S3',
-			'arguments' =>
-			array (
-				'bucket' => 'nc-' . $hostname,
-				'key' => 'nextcloud',
-				'secret' => 'nextcloud',
-				'hostname' => 'minio',
-				'port' => '9000',
-				'use_ssl' => false,
-				'use_path_style' => true,
-				'autocreate' => true,
-				'verify_bucket_exists' => true,
-			),
-		)
-	];
-}
-
-if ($primary === 'minio-multibucket') {
-	$CONFIG += [
-		'objectstore_multibucket' => array(
-			'class' => 'OC\\Files\\ObjectStore\\S3',
-			'arguments' => array(
-				// optional, defaults to 64
-				'num_buckets' => 64,
-				// n integer in the range from 0 to (num_buckets-1) will be appended
-				'bucket' => 'nc-' . $hostname,
-				'key' => 'nextcloud',
-				'secret' => 'nextcloud',
-				'hostname' => 'minio',
-				'port' => '9000',
-				'use_ssl' => false,
-				'use_path_style' => true,
-			),
-		),
-	];
-}
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta http-equiv="refresh" content="1" />
-        <meta charset="utf-8">
-        <style> 
-body {
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  margin: auto;
-  max-width: 700px;
-}
-
-.lds-ellipsis {
-  display: inline-block;
-  position: relative;
-  width: 80px;
-  height: 80px;
-}
-.lds-ellipsis div {
-  position: absolute;
-  top: 33px;
-  width: 13px;
-  height: 13px;
-  border-radius: 50%;
-  background: #000;
-  animation-timing-function: cubic-bezier(0, 1, 1, 0);
-}
-.lds-ellipsis div:nth-child(1) {
-  left: 8px;
-  animation: lds-ellipsis1 0.6s infinite;
-}
-.lds-ellipsis div:nth-child(2) {
-  left: 8px;
-  animation: lds-ellipsis2 0.6s infinite;
-}
-.lds-ellipsis div:nth-child(3) {
-  left: 32px;
-  animation: lds-ellipsis2 0.6s infinite;
-}
-.lds-ellipsis div:nth-child(4) {
-  left: 56px;
-  animation: lds-ellipsis3 0.6s infinite;
-}
-@keyframes lds-ellipsis1 {
-  0% {
-    transform: scale(0);
-  }
-  100% {
-    transform: scale(1);
-  }
-}
-@keyframes lds-ellipsis3 {
-  0% {
-    transform: scale(1);
-  }
-  100% {
-    transform: scale(0);
-  }
-}
-@keyframes lds-ellipsis2 {
-  0% {
-    transform: translate(0, 0);
-  }
-  100% {
-    transform: translate(24px, 0);
-  }
-}
-        </style>
-    </head>
-    <body>
-        <h1>Installing container</h1>
-        <p>Please wait until the server is ready. This page will redirect you to the login once done.</p>
-        <h2>Log:</h2>
-        <div class="lds-ellipsis"><div></div><div></div><div></div><div></div></div>
-        <pre>
@@ -1,31 +0,0 @@
-[primary]
-type=server
-address=database-mariadb-primary
-port=3306
-protocol=MariaDBBackend
-
-[replica1]
-type=server
-address=database-mariadb-replica
-port=3306
-protocol=MariaDBBackend
-
-[MariaDB-Monitor]
-type=monitor
-module=mariadbmon
-servers=primary,replica1
-user=root
-password=nextcloud
-
-[RW-Split-Router]
-type=service
-router=readwritesplit
-servers=primary,replica1
-user=root
-password=nextcloud
-
-[RW-Split-Listener]
-type=listener
-service=RW-Split-Router
-protocol=MariaDBClient
-port=3306
@@ -1,2 +0,0 @@
-FROM nginxproxy/nginx-proxy:latest
-ADD nginx/my_proxy.conf /etc/nginx/conf.d
@@ -1,8 +0,0 @@
-server_tokens off;
-client_max_body_size 1024m;
-
-proxy_read_timeout 3600;
-proxy_send_timeout 3600;
-proxy_connect_timeout 3600;
-
-proxy_set_header X-Forwarded-Proto $scheme;
@@ -1,100 +0,0 @@
-FROM php:8.2-apache
-
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-
-RUN chmod +x /usr/local/bin/install-php-extensions
-
-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    xdebug-^3.2 \
-    zip \
-    @composer
-
-# dev tools separate install so we quickly change without rebuilding all php extensions
-RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
-
-RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
-
-RUN { \
-        echo '[global]'; \
-        echo 'client min protocol = SMB2'; \
-        echo 'client max protocol = SMB3'; \
-        echo 'hide dot files = no'; \
-} > /etc/samba/smb.conf
-
-RUN mkdir --parent /var/log/cron
-ADD configs/cron.conf /etc/nc-cron.conf
-RUN crontab /etc/nc-cron.conf
-
-ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
-ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
-
-# Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
-
-ENV WEBROOT /var/www/html
-WORKDIR /var/www/html
-
-ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
-CMD ["apache2-foreground"]
-
-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
-ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,101 +0,0 @@
-FROM php:8.3-apache
-
-ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-
-RUN chmod +x /usr/local/bin/install-php-extensions
-
-RUN install-php-extensions \
-    apcu \
-    bcmath \
-    blackfire \
-    exif \
-    gd \
-    gmp \
-    # waiting for https://github.com/mlocati/docker-php-extension-installer/pull/811
-    # imagick \
-    intl \
-    ldap \
-    memcached \
-    oci8 \
-    opcache \
-    pcntl \
-    pdo_mysql \
-    pdo_pgsql \
-    redis \
-    smbclient \
-    sysvsem \
-    # xdebug \
-    zip \
-    @composer
-
-# dev tools separate install so we quickly change without rebuilding all php extensions
-RUN apt update && apt-get install -y --no-install-recommends \
-    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep rsync mariadb-client \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install PHPUnit
-RUN wget -O /usr/local/bin/phpunit8 https://phar.phpunit.de/phpunit-8.phar \
-    && chmod +x /usr/local/bin/phpunit8 \
-    && wget -O /usr/local/bin/phpunit9 https://phar.phpunit.de/phpunit-9.phar \
-    && chmod +x /usr/local/bin/phpunit9
-
-# Install NVM
-RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
-    && export NVM_DIR="/root/.nvm" \
-    && . "$NVM_DIR/nvm.sh" \
-    && nvm install 14 && nvm install 16 && nvm install 20 \
-    && nvm alias default 20
-
-RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
-
-RUN { \
-        echo '[global]'; \
-        echo 'client min protocol = SMB2'; \
-        echo 'client max protocol = SMB3'; \
-        echo 'hide dot files = no'; \
-} > /etc/samba/smb.conf
-
-RUN mkdir --parent /var/log/cron
-ADD configs/cron.conf /etc/nc-cron.conf
-RUN crontab /etc/nc-cron.conf
-
-ADD configs/php/nextcloud.ini /usr/local/etc/php/conf.d/nextcloud.ini
-ADD configs/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
-
-# Setup blackfire probe
-RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \
-    && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-get update  \
-    && (apt-get install -y --no-install-recommends blackfire \
-		&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \
-		&& printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \
-        mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \
-		|| echo "Skipped blackfire as the installation failed" \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
-
-# mod_rewrite
-RUN a2enmod rewrite headers
-
-# increase limit request body
-RUN echo "LimitRequestBody 0" > /etc/apache2/conf-available/limit-request-body.conf && a2enconf limit-request-body
-
-VOLUME /var/www/html
-VOLUME /var/www/html/apps-writable
-VOLUME /var/www/html/config
-VOLUME /var/www/html/data
-
-ENV SQL sqlite
-ENV NEXTCLOUD_AUTOINSTALL YES
-ENV WITH_REDIS NO
-
-ENV WEBROOT /var/www/html
-WORKDIR /var/www/html
-
-ENTRYPOINT  ["/usr/local/bin/bootstrap.sh"]
-CMD ["apache2-foreground"]
-
-ADD data/installing.html /root/installing.html
-ADD configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/storage.config.php configs/redis.config.php configs/apcu.config.php /root/
-ADD bin/bootstrap.sh bin/occ /usr/local/bin/
@@ -1,7 +0,0 @@
-FROM alpine
-
-RUN wget https://github.com/nextcloud/notify_push/releases/download/v0.6.3/notify_push-`uname -m`-unknown-linux-musl -O /notify_push && chmod +x /notify_push && /notify_push --version
-
-EXPOSE 7867
-
-CMD ["/notify_push"]
@@ -1,49 +0,0 @@
-# Taken from https://github.com/strukturag/nextcloud-spreed-signaling/blob/54c1af7f4f1b598a9f2c1ae37b76b37e9dda3ee8/docker/janus/Dockerfile
-
-# Modified from https://gitlab.com/powerpaul17/nc_talk_backend/-/blob/dcbb918d8716dad1eb72a889d1e6aa1e3a543641/docker/janus/Dockerfile
-FROM alpine:3.18
-
-RUN apk add --no-cache curl autoconf automake libtool pkgconf build-base \
-  glib-dev libconfig-dev libnice-dev jansson-dev openssl-dev zlib libsrtp-dev \
-  gengetopt libwebsockets-dev git curl-dev libogg-dev
-
-# usrsctp
-# 08 Oct 2021
-ARG USRSCTP_VERSION=7c31bd35c79ba67084ce029511193a19ceb97447
-
-RUN cd /tmp && \
-    git clone https://github.com/sctplab/usrsctp && \
-    cd usrsctp && \
-    git checkout $USRSCTP_VERSION && \
-    ./bootstrap && \
-    ./configure --prefix=/usr && \
-    make && make install
-
-# libsrtp
-ARG LIBSRTP_VERSION=2.4.2
-RUN cd /tmp && \
-    wget https://github.com/cisco/libsrtp/archive/v$LIBSRTP_VERSION.tar.gz && \
-    tar xfv v$LIBSRTP_VERSION.tar.gz && \
-    cd libsrtp-$LIBSRTP_VERSION && \
-    ./configure --prefix=/usr --enable-openssl && \
-    make shared_library && \
-    make install && \
-    rm -fr /libsrtp-$LIBSRTP_VERSION && \
-    rm -f /v$LIBSRTP_VERSION.tar.gz
-
-# JANUS
-
-ARG JANUS_VERSION=0.11.8
-RUN mkdir -p /usr/src/janus && \
-    cd /usr/src/janus && \
-    curl -L https://github.com/meetecho/janus-gateway/archive/v$JANUS_VERSION.tar.gz | tar -xz && \
-    cd /usr/src/janus/janus-gateway-$JANUS_VERSION && \
-    ./autogen.sh && \
-    ./configure --disable-rabbitmq --disable-mqtt --disable-boringssl && \
-    make && \
-    make install && \
-    make configs
-
-WORKDIR /usr/src/janus/janus-gateway-$JANUS_VERSION
-
-CMD [ "janus", "--full-trickle" ]
@@ -1,77 +0,0 @@
-# Getting started
-
-## Tutorial
-
-You can find a [step by step tutorial on how to use this setup](https://cloud.nextcloud.com/s/iyNGp8ryWxc7Efa?path=%2F1%20Setting%20up%20a%20development%20environment) in the [Nextcloud Developer Portal](https://nextcloud.com/developer/). It will guide you through the setup and show you how to use it for app development.
-
-There are two ways of using this setup. **A persistent setup is the most common one** where you have a local git clone of all required repositories. The other one is a standalone setup that can be used to quickly run parts of the Nextcloud ecosystem source code without having to clone everything.
-
-## Persistent development setup
-
-!!! note
-    This is the recommended way to run the setup for development. You will have a local clone of all required source code.
-
-To start the setup run the following commands to clone the repository and bootstrap the setup. This will prepare your setp and clone the Nextcloud server repository and required apps into the `workspace` folder.
-```bash
-git clone https://github.com/juliushaertl/nextcloud-docker-dev
-cd nextcloud-docker-dev
-./bootstrap.sh
-```
-
-This may take some time depending on your internet connection speed.
-
-
-Once done you can start the Nextcloud container using:
-```bash
-docker-compose up nextcloud
-```
-
-You can also start it in the background using `docker-compose up -d nextcloud`.
-
-You can then access your Nextcloud instance at [http://nextcloud.local](http://nextcloud.local). The default username is `admin` and the password is `admin`. [Other users can be found in the documentation](https://juliushaertl.github.io/nextcloud-docker-dev/basics/overview/#default-users).
-
-!!! warning
-    Note that for performance reasons the server repository might have been cloned with `--depth=1` by default. To get the full history it is highly recommended to run:
-
-```bash
-cd workspace/server
-git fetch --unshallow
-git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-git fetch origin
-```
-
-
-## Standalone containers
-
-!!! note
-    This is a very simple way but doesn't cover all features. If you are looking for a fully featured setup you may skip to the next section
-
-There is a standalone version of the Nextcloud containers available that can be used to run Nextcloud without the other services. This is useful if you are just wanting to get started with app development against a specific server version, or to just have a quick way to develop, test or debug.
-
-These containers support automatic fetching of the server source code and use SQLite as the database. The server source code is fetched from the official Nextcloud server repository and the version can be specified using the `NEXTCLOUD_VERSION` environment variable. The default version is `master`.
-
-Running the containers does not need this repository to be cloned.
-
-Example for running a Nextcloud server from the master branch of server:
-
-```bash
-docker run --rm -p 8080:80 ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-
-For app development you can mount your app directly into the container:
-
-```bash
-docker run --rm -p 8080:80 -v ~/path/to/appid:/var/www/html/apps-extra/appid ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-
-The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specificing either a server branch or git tag.
-
-```bash
-docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-
-You can also mount your local server source code into the container to run a local version of Nextcloud:
-
-```bash
-docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 -v /tmp/server:/var/www/html ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
@@ -1,44 +0,0 @@
-# Hostnames
-
-## Using /etc/hosts
-
-In order to use the hostnames provided by the environment you need to add them to the /etc/hosts file (which is the simplest method).
-
-You can do this by running the following command, which will automatically update entires:
-
-```bash
-./scripts/update-hosts.sh
-```
-
-## dnsmasq to resolve wildcard domains
-
-Instead of adding the individual container domains to `/etc/hosts` a local dns server like dnsmasq can be used to resolve any domain ending with the configured `DOMAIN_SUFFIX` in `.env` to localhost.
-
-For dnsmasq adding the following configuration would be sufficient for `DOMAIN_SUFFIX=.local`:
-
-```
-address=/.local/127.0.0.1
-```
-
-To run dnsmasq in a container, you can use the following example:
-
-```
-docker run --rm -it \
-    -e DMQ_DHCP_RANGES=" " \
-    -e DMQ_DHCP_DNS=" " \
-    -e DMQ_DHCP_GATEWAY=" " \
-    -e DMQ_DNS_ADDRESS="address=/.local/127.0.0.1" \
-    -p 53:53 \
-    -p 53:53/udp \
-    drpsychick/dnsmasq:latest 
-```
-
-## Use DNS Service Discovery on MacOS
-
-You can also use the `dns-sd` tool on MacOS to advertise the container domains on the network. This is especially useful if you try to connect from an iPhone or iPad, since those devices do not allow to edit the `/etc/hosts` file. Use the tool like this:
-
-```
-dns-sd -P nextcloud _http._tcp local 80 nextcloud.local 192.168.0.10
-```
-
-Be aware that since this is advertised in the local network, it is not recommended to use it in a network where multiple instances could be running. In this case you might want to change the `DOMAIN_SUFFIX` in `.env` to prevent any collision.
@@ -1,47 +0,0 @@
-# Overview
-
-## Nextcloud containers
-
-There are multiple containers that can be started for Nextcloud. The main `nextcloud` container is targetting the main workspace directly (usually for running the master/main branch of Nextcloud server and apps) of the latest development version. In addition there are stable containers for running the stable major version branches in parallel.
-
-Additional services like databases, redis cache, minio object storage and others are provided as separate containers and are shared between the different Nextcloud containers. They still isolate data of the individual Nextcloud containers from each other.
-
-For any HTTP services a nginx proxy container is used to route requests to the correct container. This proxy is automatically started.
-
-## Default users
-
-The following user accounts are available by default:
-
- `admin` / `admin`
- `alice` / `alice`
- `bob` / `bob`
- `user1` / `user1`
- `user2` / `user2`
- `user3` / `user3`
- `user4` / `user4`
-
-## App directories
-
-The Nextcloud containers are configured to use multiple app directories.
-
- Use `apps/` for required apps (like `viewer`)
- Use `apps-extra/` for apps that support only one specific nextcloud version (like `talk`)
- Use `apps-shared/` for apps that support multiple nextcloud versions as this directory is shared between all containers
-
-## Cronjobs
-
-The cronjobs are configured to run every 5 minutes in the individual containers.
-
-For testing you can also run them manually:
-
-```bash
-docker-compose exec nextcloud php cron.php
-```
-
-### occ
-
-Run inside of the Nextcloud container:
-
-```
-set XDEBUG_CONFIG=idekey=PHPSTORM
-sudo -E -u www-data php -dxdebug.remote_host=192.168.21.1 occ
@@ -1,23 +0,0 @@
-# HTTPS
-
-A nginx proxy container is used to route requests to the correct container. This proxy is automatically started. It can be configured to use HTTPS by setting the `PROTOCOL` environment variable to `https` in the `.env` file. The container will pick up SSL certificates automatically from `data/ssl/` named by the domain name.
-
-# Use mkcert
-
-mkcert is a simple tool for making locally-trusted development certificates. It requires no configuration. This would be the recommended way to generate certificates for local development.
-
-* Install [mkcert](https://github.com/FiloSottile/mkcert)
-* Go to `data/ssl`
-* `mkcert -cert-file nextcloud.local.crt -key-file nextcloud.local.key nextcloud.local`
-* Add `PROTOCOL=https` to your `.env` file
-* `docker-compose restart proxy`
-* There is also a script to generate/update all certs: `./scripts/update-certs`
-
-## Use self-signed certificates
-
-You can generate self-signed certificates using:
-
-```
-cd data/ssl
-openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout  nextcloud.local.key -out nextcloud.local.crt
-```
@@ -1,37 +0,0 @@
-# Stable Nextcloud versions
-
-As described in the [overview](overview.md) there are multiple Nextcloud containers available. The main `nextcloud` container is targetting the main workspace directly (usually for running the master/main branch of Nextcloud server and apps) of the latest development version. In addition there are stable containers for running the stable major version branches in parallel.
-
-## Prepare your git checkouts for running a stable version
-
-In order to run a stable version you need to have the corresponding git checkouts available. Using [git worktree](https://blog.juliushaertl.de/index.php/2018/01/24/how-to-checkout-multiple-git-branches-at-the-same-time/) makes it easy to have different branches checked out in parallel in separate directories and is the recommended way to work with stable branches in parallel.
-
-Assuimg you have already cloned the repository into `~/nextcloud-docker-dev/workspace/server` you can run the following commands to create a new worktree for the stable28 branch:
-
-```bash
-# create a new worktree for the stable28 branch
-cd ~/nextcloud-docker-dev/workspace/server
-git worktree add ../stable28 stable28
-cd ~/nextcloud-docker-dev/workspace/stable28
-# make sure submodules are installed in the stable server root directory
-git submodule update --init
-```
-
-### Add worktree for additional apps
-
-This will be required for every app that you need on the stable branches, so run this for viewer but also for any other app you need.
-
-```bash
-cd ~/nextcloud-docker-dev/workspace/server/apps/viewer
-git worktree add ../../../stable28/apps/viewer stable28
-```
-
-## Start the stable28 container
-
-```bash
-docker-compose up -d stable28
-```
-
-## Apps without stable branches
-
-Some apps do not have stable branches or cover multiple Nextcloud version. You can use the `ADDITIONAL_APPS_PATH` variable in your `.env` file to add add a cloned app to all Nextcloud containers. By default this is set to `./data/apps-extra`
@@ -1,33 +0,0 @@
-# Standalone containers
-
-There is a standalone version of the Nextcloud containers available that can be used to run Nextcloud without the other services. This is useful if you are just wanting to get started with app development against a specific server version, or to just have a quick way to develop, test or debug.
-
-These containers support automatic fetching of the server source code and use SQLite as the database. The server source code is fetched from the official Nextcloud server repository and the version can be specified using the `NEXTCLOUD_VERSION` environment variable. The default version is `master`.
-
-Running the containers does not need this repository to be cloned.
-
-Example for running a Nextcloud server from the master branch of server:
-
-```bash
-docker run --rm -p 8080:80 ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-
-For app development you can mount your app directly into the container:
-
-```bash
-docker run --rm -p 8080:80 \
-    -v ~/path/to/appid:/var/www/html/apps-extra/appid \
-    ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-
-The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specificing either a server branch or git tag.
-
-```bash
-docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
-
-You can also mount your local server source code into the container to run a local version of Nextcloud:
-
-```bash
-docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 -v /tmp/server:/var/www/html ghcr.io/juliushaertl/nextcloud-dev-php80:latest
-```
@@ -1,13 +0,0 @@
-# Troubleshooting
-
- If your setup isn't working and you can not figure out the reason why, running
-`docker-compose down -v` will remove the relevant containers and volumes,
-allowing you to run `docker-compose up` again from a clean slate.
- You can run `./bootstrap.sh` again to check the setup and detected paths for your source code destination
- In extreme cases, clean everything: `docker system prune --all`
- If you start your stable containers (not the master) and it wants to install Nextcloud even if it is not the first start, you may have removed the configuration with the last `docker-compose down` command. Try to use `docker-compose stop` instead or give the stable setup named values yourself.
-
-## Logs
-
- You can use `docker-compose logs -f` to follow the logs of all containers
- You can use `docker-compose logs -f nextcloud` to follow the logs of the Nextcloud container
@@ -1,22 +0,0 @@
-# Update
-
-## Updating the development environment
-
- `git pull` to get the latest changes
- `make pull-installed` to pull the latest versions of all images that are already downloaded
- `make pull-all` to pull the latest versions of all images
- After pulling make sure to either recreate the containers manually or recreate the full development environment through `docker compose down -v` and `docker compose up -d proxy nextcloud ...` for the containers in use.
-
-## Updating the Nextcloud server
-
-As Nextcloud containers are bound to a server major version and the code is updated through manual git pull, you only need to call occ update on demand
-
-```bash
-docker-compose exec nextcloud occ upgrade
-```
-
-### Major version bump
-
-In case Nextcloud server bumps the major version, you will need to pull all repositories again to the latest state to get the compatibility changes.
-
-You might want to take the opportunity to then setup the previous version as a new stable version setup. See [stable versions](stable-versions.md) for more information.
@@ -1,13 +0,0 @@
-# Build containers
-
-This is usually only required if you want to test changes to the containers or if you want to build the containers yourself instead of using the prebuilt images.
-
-You can build the containers manually for testing local changes by calling make with the Dockerfile as the target:
-
-```bash
-make docker/php82/Dockerfile
-make docker/Dockerfile.php81
-make docker/Dockerfile.php80
-```
-
-Afterwards you can recrate the container with `docker-compose up -d --force-recreate nextcloud` to run the new image or use `docker-compose down -v` before to also reinstall Nextcloud.
@@ -1,36 +0,0 @@
-# Config
-
-## PHP Version
-
-The PHP version can be changed by setting the `PHP_VERSION` environment variable in your local `.env` file. If no value is set the minimum required version for the current Nextcloud version will be used depending on the Nextcloud container.
-
-```bash
-# For using PHP 8.3
-PHP_VERSION=83
-```
-
-The variable supports the following values:
-
- PHP 7.1: `71`
- PHP 7.2: `72`
- PHP 7.3: `73`
- PHP 7.4: `74`
- PHP 8.0: `80`
- PHP 8.1: `81`
- PHP 8.2: `82`
- PHP 8.3: `83` (currently the xdebug and imagick php extensions are not available for this version)
-
-## Nextcloud config.php
-
-The config.php file of Nextcloud is pre-seeded with lots of configuration values. In order to change them you can place a personal config.php file in `data/shared/config.php`. This file will be included after the default config.php file for all Nextcloud containers.
-
-```php
-<?php
-$CONFIG = [
-    'loglevel' => 2,
-    'log_query' => true,
-    'log.condition' => [
-        'apps' => ['myapp'],
-    ],
-];  
-```
@@ -1,29 +0,0 @@
-# Setup hooks
-
-In order to customize the behavior of the application, you can use hooks. Hooks need to be placed in the `data/shared/hooks/` directory. They will be picked up by the docker containers automatically. They can be used for automating setup specific to a developers use cases. For example, you can use them to create a user, install an app, or run a script before or after the installation of Nextcloud.
-
-The following hooks are currently available:
-
- before-install.sh Runs before the installation of Nextcloud
- after-install.sh Runs after the installation of Nextcloud
- before-start.sh Runs before the start of Nextcloud webserver
- after-start.sh Runs after the start of Nextcloud webserver
-
-## Example for after-install.sh
-
-```bash
-#!/bin/bash
-
-echo 'Create some users'
-export OC_PASS=mycustomuser
-occ user:add --password-from-env mycustomuser
-```
-
-## Example for before-start.sh
-
-```bash
-#!/bin/bash
-
-echo 'Always disable the firstrunwizard'
-occ app:disable firstrunwizard
-```
@@ -1,15 +0,0 @@
-# Tips
-
-## Shell aliases
-
-It can be useful to be able to access your setup quickly through your shell. Here are some examples that you could add to your bashrc or zshrc:
-
-## nc-dev
-
-The following shell function allows you to run `nc-dev` instead of `docker-compose` in any location. This way you can run for example `nc-dev up -d nextcloud`, `nc-dev exec nextcloud bash` or `nc-dev exec nextcloud occ`.
-
-````
-nc-dev() {
- (cd ~/path/to/nextcloud-docker-dev && docker-compose $@)
-}
-```
@@ -1,17 +0,0 @@
-This documentation covers a Nextcloud development environment using docker-compose providing a large variety of services for Nextcloud server and app development and testing.
-
-⚠ **DO NOT USE THIS IN PRODUCTION** 
-
-Various settings in this setup are considered insecure and default passwords and secrets are used all over the place
-
- ☁ Nextcloud containers for running multiple versions
- 🐘 Multiple PHP versions
- 🔒 Nginx proxy with optional SSL termination
- 🛢️ MySQL/PostgreSQL/MariaDB/SQLite/MaxScale, Redis cache
- 💾 Local or S3 primary storage
- 👥 LDAP with example user data, Keycloak
- ✉ Mailhog for testing mail sending
- 🚀 Blackfire, Xdebug for profiling and debugging
- 📄 Lots of integrating service containers: Collabora Online, Onlyoffice, Elasticsearch, ...
-
-Follow the [getting started guide](https://juliushaertl.github.io/nextcloud-docker-dev/basics/getting-started/) or the [Nextcloud developer tutorial](https://nextcloud.com/developer/) to get started.
@@ -1,8 +0,0 @@
-# Antivirus
-
-```bash
-docker-compose up -d proxy nextcloud av
-```
-
-The [ClamAV](https://www.clamav.net/) antivirus will then be exposed as a daemon with host `nextav` and
-port `3310`.
@@ -1,74 +0,0 @@
-# Database
-
-## Introduction
-
-By default MySQL will be used as database backend. You can change this by setting the `SQL` variable in the `.env` file. The following databases are supported:
-
- `mysql`
- `pgsql`
- `sqlite`
- `mariadb-replica`
- `maxscale`
-
-Changing the database env value will require to recreate your setup. You can do this by running `docker-compose down -v` and then `docker-compose up -d nextcloud`.
-
-All databases use the following credentials by default:
-
- Root password: `nextcloud`
- Username: `nextcloud`
- Password: `nextcloud`
- Database: `nextcloud` or the name of the stable container e.g. `stable27``
-
-## Accessing the database
-
-### MySQL/MariaDB
-
-You can access the database with the following command:
-
-```bash
-docker-compose exec mariadb mysql -u root -pnextcloud
-```
-
-If you prefer a GUI frontend you can additionally launch the phpmyadmin container with `docker-compose up -d phpmyadmin` and access it via <http://phpmyadmin.local>.
-
-Alternatively you can use a database client to access the database from the host system. The port can be obtained with `docker-compose port database-mysql 3306`. The host is `localhost` and the credentials are the same as above.
-
-### PostgreSQL
-
-You can access the database with the following command:
-
-```bash
-docker-compose exec postgres psql -U nextcloud -d nextcloud
-```
-
-If you prefer a GUI frontend you can additionally launch the pgadmin container with `docker-compose up -d pgadmin` and access it via <http://pgadmin.local>.
-
-Alternatively you can use a database client to access the database from the host system. The port can be obtained with `docker-compose port database-postgresql 5432`. The host is `localhost` and the credentials are the same as above.
-
-After you have started the container open `pgadmin.local` in a web browser. The password for the `nextcloud.local` is `postgres`.
-That's it, open the following path to see the Nextcloud tables: `Server group 1 -> nextcloud.local -> Databases -> nextcloud -> Schemas -> public -> Tables`
-
-### SQLite
-
-You can access the database with the following command:
-
-```bash
-docker-compose exec nextcloud sqlite3 /var/www/html/data/nextcloud.db
-```
-
-### MariaDB Replica
-
-This mode runs a mariadb primary and read replica setup. The primary is used for writes and the replica for reads. This is useful for larger setups where you want to scale the database.
-
-You can access the database with the following command:
-
-```bash
-docker-compose exec database-mariadb-primary mysql -u root -pnextcloud
-docker-compose exec database-mariadb-replica mysql -u root -pnextcloud
-```
-
-### MaxScale
-
-This mode runs a mariadb primary and read replica setup with maxscale as load balancer. The primary is used for writes and the replica for reads where MaxScale is used to perform a read-write-split.
-
-The logs of MaxScale can be accessed with `docker-compose exec maxscale cat /var/log/maxscale/maxscale.log`.
@@ -1,8 +0,0 @@
-# Imaginary
-
-Enable the imaginary server for generating previews
-
-```bash
-docker-compose up proxy nextcloud previews_hpb
-./scripts/enable-preview-imaginary.sh
-```
@@ -1,11 +0,0 @@
-# LDAP
-
-The LDAP sample data is based on <https://github.com/rroemhild/docker-test-openldap> and extended with randomly generated users/groups. For details see [data/ldap-generator/](https://github.com/juliushaertl/nextcloud-docker-dev/tree/master/data/ldap-generator). LDAP will be configured automatically if the ldap container is available during installation.
-
-Example users are: `leela fry bender zoidberg hermes professor`. The password is the same as the uid.
-
-## Useful commands
-
- Run an LDAP search
-  - `ldapsearch -x -H ldap://$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' nextcloud_ldap_1) -D "cn=admin,dc=planetexpress,dc=com" -w admin -b "dc=planetexpress,dc=com" -s subtree <filter> <attrs>`
-  - `docker-compose exec ldap ldapsearch -H 'ldap://localhost' -D "cn=admin,dc=planetexpress,dc=com" -w admin -b "dc=planetexpress,dc=com" "(&(objectclass=inetOrgPerson)(description=*use*))"`
@@ -1,3 +0,0 @@
-# Mail
-
-Sending mails from Nextcloud usually requires an email server and account to be configured. This setup provides a [mailhog](https://github.com/mailhog/MailHog) installation that is autoconfigured, so you can browse all mails sent from Nextcloud in the webui by opening [mail.local](http://mail.local) in your browser.
@@ -1,19 +0,0 @@
-## Global scale
-
-```
-docker-compose up -d proxy portal gs1 gs2 lookup database-mysql
-```
-
-Users are named the same as the instance name, e.g. `gs1`, `gs2`
-
-## [Fulltextsearch](https://github.com/nextcloud/fulltextsearch)
-
-```
-docker-compose up -d elasticsearch elasticsearch-ui
-```
-
- Address for configuring in Nextcloud: `http://elastic:elastic@elasticsearch:9200`
- Address to access Elasticsearch from outside: `http://elastic:elastic@elasticsearch.local`
- Address for accessing the UI: <http://elasticsearch-ui.local/>
-
-`sudo sysctl -w vm.max_map_count=262144`
@@ -1,29 +0,0 @@
-# Nextcloud Office / Collabora Online
-
-Nextcloud Office is a self-hosted and online office suite that can be used with Nextcloud based on Collabora Online.
-
-## Automatic setup
-
-A script is available to automatically setup Collabora Online for you combined with an already running Nextcloud container.
-
-It requires to have the [richdocuments](https://github.com/nextcloud/richdocuments) app cloned into your apps directory.
-
-```bash
-./scripts/enable-collabora <container-name>
-```
-
-## Manual steps
-
- Make sure to have the Collabora hostname setup in your `/etc/hosts` file: `127.0.0.1 collabora.local`
- Clone, build and enable the [richdocuments](https://github.com/nextcloud/richdocuments) app
- Start the Collabora Online server in addition to your other containers `docker-compose up -d collabora`
- Make sure you have the [richdocuments app](https://github.com/nextcloud/richdocuments) cloned to your `apps-extra` directory and built the frontend code of the app with `npm ci && npm run build`
- Enable the app and configure `collabora.local` in the Collabora settings inside of Nextcloud
-
-## Using with HTTPS
-
-To properly work with HTTPS, you need to add the following parameter to the Collabora container in the `.env`file:
-
-```
-COLLABORA_PARAMS="--o:ssl.termination=true"
-```
@@ -1,20 +0,0 @@
-# ONLYOFFICE
-
-ONLYOFFICE is a self-hosted office suite that can be used with Nextcloud.
-
-## Automatic setup
-
-A script is available to automatically setup ONLYOFFICE for you combined with an already running Nextcloud container.
-
-It requires to have the onlyoffice integration app cloned into your apps directory.
-
-```bash
-./scripts/enable-onlyoffice <container-name>
-```
-
-## Manual steps
-
- Make sure to have the ONLYOFFICE hostname setup in your `/etc/hosts` file: `127.0.0.1 onlyoffice.local`
- Start the ONLYOFFICE server in addition to your other containers `docker-compose up -d onlyoffice`
- Clone <https://github.com/ONLYOFFICE/onlyoffice-nextcloud> into your apps directory
- Enable the app and configure `onlyoffice.local` in the ONLYOFFICE settings inside of Nextcloud
@@ -1,9 +0,0 @@
-# S3 / Object storage
-
-## Primary object storage
-
-Primary object storage can be enabled by setting the `PRIMARY=minio` environment variable either in your `.env` file or in `docker-compose.yml` for individual containers.
-
-```bash
-docker-compose up nextcloud minio
-```
@@ -1,77 +0,0 @@
-
-# SSO/SAML/OpenID Connect
-
-## [Keycloak](https://www.keycloak.org/)
-
- Keycloak is using LDAP as a user backend (make sure the LDAP container is also running)
- `occ user_oidc:provider Keycloak -c nextcloud -s 09e3c268-d8bc-42f1-b7c6-74d307ef5fde -d http://keycloak.dev.local/auth/realms/Example/.well-known/openid-configuration`
- <http://keycloak.dev.local/auth/realms/Example/.well-known/openid-configuration>
- nextcloud
- 09e3c268-d8bc-42f1-b7c6-74d307ef5fde
-
-## SAML
-
-```
-docker-compose up -d proxy nextcloud saml
-```
-
- uid mapping: `urn:oid:0.9.2342.19200300.100.1.1`
- idp entity id: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/metadata.php`
- Single Sign-On (SSO) service url: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/SSOService.php`
- single log out service url: `https://sso.local.dev.bitgrid.net/simplesaml/saml2/idp/SingleLogoutService.php`
- use certificate from `docker/configs/var-simplesamlphp/cert/example.org.crt`
-
-  ```
-  -----BEGIN CERTIFICATE-----
-  MIICrDCCAhWgAwIBAgIUNtfnC2jE/rLdxHCs2th3WaYLryAwDQYJKoZIhvcNAQEL
-  BQAwaDELMAkGA1UEBhMCREUxCzAJBgNVBAgMAkJZMRIwEAYDVQQHDAlXdWVyemJ1
-  cmcxFDASBgNVBAoMC0V4YW1wbGUgb3JnMSIwIAYDVQQDDBlzc28ubG9jYWwuZGV2
-  LmJpdGdyaWQubmV0MB4XDTE5MDcwMzE0MjkzOFoXDTI5MDcwMjE0MjkzOFowaDEL
-  MAkGA1UEBhMCREUxCzAJBgNVBAgMAkJZMRIwEAYDVQQHDAlXdWVyemJ1cmcxFDAS
-  BgNVBAoMC0V4YW1wbGUgb3JnMSIwIAYDVQQDDBlzc28ubG9jYWwuZGV2LmJpdGdy
-  aWQubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHPZwU+dAc76yB6bOq
-  0AkP1y9g7aAi1vRtJ9GD4AEAsA3zjW1P60BYs92mvZwNWK6NxlJYw51xPak9QMk5
-  qRHaTdBkmq0a2mWYqh1AZNNgCII6/VnLcbEIgyoXB0CCfY+2vaavAmFsRwOMdeR9
-  HmtQQPlbTA4m5Y8jWGVs1qPtDQIDAQABo1MwUTAdBgNVHQ4EFgQUeZSoGKeN5uu5
-  K+n98o3wcitFYJ0wHwYDVR0jBBgwFoAUeZSoGKeN5uu5K+n98o3wcitFYJ0wDwYD
-  VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQA25X/Ke+5dw7up8gcF2BNQ
-  ggBcJs+SVKBmPwRcPQ8plgX4D/K8JJNT13HNlxTGDmb9elXEkzSjdJ+6Oa8n3IMe
-  vUUejXDXUBvlmmm+ImJVwwCn27cSfIYb/RoZPeKtned4SCzpbEO9H/75z3XSqAZS
-  Z1tiHzYOVtEs4UNGOtz1Jg==
-  -----END CERTIFICATE-----
-  ```
-
- cn `urn:oid:2.5.4.3`
- email `urn:oid:0.9.2342.19200300.100.1.3`
-
-## Environment-based SSO
-
-A simple approach to test environment-based SSO with the `user_saml` app is to use Apache's basic auth with the following configuration:
-
-```
-
-<Location /login>
- AuthType Basic
- AuthName "SAML"
- AuthUserFile /var/www/html/.htpasswd
- Require valid-user
-</Location>
-<Location /index.php/login>
- AuthType Basic
- AuthName "SAML"
- AuthUserFile /var/www/html/.htpasswd
- Require valid-user
-</Location>
-<Location /index.php/apps/user_saml/saml/login>
- AuthType Basic
- AuthName "SAML"
- AuthUserFile /var/www/html/.htpasswd
- Require valid-user
-</Location>
-<Location /apps/user_saml/saml/login>
- AuthType Basic
- AuthName "SAML"
- AuthUserFile /var/www/html/.htpasswd
- Require valid-user
-</Location>
-```
@@ -1,8 +0,0 @@
-# Talk HPB
-
- Make sure to have the signaling hostname setup in your `/etc/hosts` file: `127.0.0.1 talk-signaling.local`
- Automatically enable for one of your containers (e.g. the main `nextcloud` one):
-  - Run `./scripts/enable-talk-hpb.sh nextcloud`
- Manual setup
-  - Start the talk signaling server and janus in addition to your other containers `docker-compose up -d talk-signaling talk-janus`
-  - Go to the admin settings of talk and add the signaling server (`http://talk-signaling.local` with shared secret `1234`)
@@ -1,18 +0,0 @@
-# Blackfire
-
-Blackfire needs to use a hostname/ip that is resolvable from within the Blackfire container. Their free version is [limited to local profiling](https://support.blackfire.io/troubleshooting/hack-edition-users-cannot-profile-non-local-http-applications) so we need to browse Nextcloud though its local docker IP or add the hostname to `/etc/hosts`.
-
-By default the PHP module for Blackfire is disabled, but you can enable or disable this through the following script:
-
-```
-./scripts/php-mod-config nextcloud blackfire on
-```
-
-After that you can use Blackfire through the browser plugin or curl as described below.
-
-### Using with curl
-
-```
-alias blackfire='docker-compose exec -e BLACKFIRE_CLIENT_ID=$BLACKFIRE_CLIENT_ID -e BLACKFIRE_CLIENT_TOKEN=$BLACKFIRE_CLIENT_TOKEN blackfire blackfire'
-blackfire curl http://192.168.21.8/
-```
@@ -1,22 +0,0 @@
-# Xdebug
-
-Xdebug is shipped but disabled by default. It can be turned on by running:
-
-```
-./scripts/php-mod-config nextcloud xdebug.mode debug
-```
-
-You can also enable other modes, e.g. trace:
-
-````
-./scripts/php-mod-config nextcloud xdebug.mode debug,trace
-```
-
-### Debugging cron, occ or other command line scripts
-
-```
-docker compose exec nextcloud bash
-# use this if you have configured path mapping in PHPstorm to match the server name configured
-export PHP_IDE_CONFIG=serverName=localhost
-sudo -E -u www-data php -dxdebug.mode=debug -dxdebug.client_host=host.docker.internal -dxdebug.start_with_request=yes -dxdebug.idekey=PHPSTORM occ
-```
@@ -1,22 +1,14 @@
 COMPOSE_PROJECT_NAME=master

-# Default protocol to use for Nextcloud and other containers
-# check the readme for details how to setup https
-PROTOCOL=http
-
 # Paths
-# REPO_PATH_SERVER=/home/alice/nextcloud-docker-dev/workspace/server
-
-# Specify a path to apps which will be shared between all containers. Useful for apps that support multiple nextcloud versions
-# ADDITIONAL_APPS_PATH=/home/alice/nextcloud-docker-dev/workspace/server/apps-shared
+REPO_PATH_SERVER=/home/jus/repos/nextcloud/server
+ADDITIONAL_APPS_PATH=/home/jus/repos/nextcloud/server/apps-extra

 # Stable releases root directory
-# STABLE_ROOT_PATH=/home/alice/nextcloud-docker-dev/workspace
+STABLE_ROOT_PATH=/home/jus/repos/nextcloud/

 # Install Nextcloud apps per default
 # NEXTCLOUD_AUTOINSTALL_APPS="viewer activity"
-# Retry enabling apps for a provided amount of time (can be useful when using the containers in CI)
-# NEXTCLOUD_AUTOINSTALL_APPS_WAIT_TIME=0

 # Blackfire configuration
 # BLACKFIRE_CLIENT_ID=
@@ -40,12 +32,16 @@ DOMAIN_SUFFIX=.local
 # PHP_VERSION=72
 # PHP_VERSION=73
 # PHP_VERSION=74
-# PHP_VERSION=80
-# PHP_VERSION=81

-# May be used to choose database (sqlite, pgsql, mysql)
+# May be used to choose database. Both SQL and DB_SERVICE have to be set if used. Defaults to mysql.
 # SQL=pgsql
+# DB_SERVICE=database-postgres

-# The mode of the xdebuger extention. This can be a comma separated list of
-# the entries none, develop, debug, trace, and profile.
-PHP_XDEBUG_MODE=develop
+
+# Your server git with your organization or user.
+# Example : https://github.com/nextcloud
+# SERVER_GIT_WITH_ORGANIZATION=""
+
+# You define your apps list to clone.
+# Example: APPS=(viewer recommendations files_pdfviewer profiler)
+# APPS=()
@@ -1,5 +0,0 @@
-site_name: nextcloud-docker-dev
-theme:
-  name: readthedocs
-markdown_extensions:
-  - admonition
@@ -1,14 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
-  "labels": ["dependencies"],
-  "packageRules": [
-    {
-      "matchDatasources": ["docker"],
-      "matchPackageNames": ["php"],
-      "enabled": false
-    }
-  ]
-}
@@ -1,86 +0,0 @@
-#!/bin/bash -e
-
-isShallow() {
-    # Reference: https://stackoverflow.com/a/37533086
-    local isShallow
-    isShallow="$(git rev-parse --is-shallow-repository)"
-    if [ "$isShallow" = 'true' ]
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
-unshallow() {
-    echo "Unshallowing installation as it is needed"
-    git fetch --unshallow
-}
-
-isPartialClone() {
-    git config --get "remote.$1.partialclonefilter" &> /dev/null && return 0 || return 1
-}
-
-unpartial () {
-    git config --unset "remote.$1.partialclonefilter"
-    git fetch --refetch
-}
-
-UNSHALLOW=1
-UNPARTIAL=1
-REPOSITORY=workspace/server
-ORIGIN=origin
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-        --no-unshallow)
-            UNSHALLOW=0
-            ;;
-        --unshallow)
-            UNSHALLOW=1
-            ;;
-        --no-unpartial)
-            UNPARTIAL=0
-            ;;
-        --unpartial)
-            UNPARTIAL=1
-            ;;
-        --repository)
-            REPOSITORY="$2"
-            shift
-            ;;
-        --origin)
-            ORIGIN="$2"
-            shift
-            ;;
-        *)
-            echo "Unknown parameter '$1' found. Exiting."
-            exit 1
-            ;;
-    esac
-    shift
-done
-
-cd "$REPOSITORY"
-
-if [ "$UNSHALLOW" = 1 ]
-then
-    if isShallow
-    then
-        unshallow
-    else
-        echo 'The repository is already unshallowed'
-    fi
-fi
-
-if [ "$UNPARTIAL" = 1 ]
-then
-    if isPartialClone "$ORIGIN"
-    then
-        echo 'Partial clone found'
-        unpartial "$ORIGIN"
-    else
-        echo 'Repository does not contain partial clones'
-    fi
-fi
@@ -18,9 +18,8 @@ source .env
 echo "Setting up Collabora with collabora$DOMAIN_SUFFIX on $CONTAINER"
 docker-compose up -d collabora
 occ app:enable richdocuments
-occ config:app:set richdocuments wopi_url --value="${PROTOCOL:-http}://collabora${DOMAIN_SUFFIX}"
-occ config:app:set richdocuments public_wopi_url --value="${PROTOCOL:-http}://collabora${DOMAIN_SUFFIX}"
-occ config:app:set richdocuments disable_certificate_verification --value="yes"
+occ config:app:set richdocuments wopi_url --value="http://collabora${DOMAIN_SUFFIX}"
+occ config:app:set richdocuments public_wopi_url --value="http://collabora${DOMAIN_SUFFIX}"
 occ config:system:set allow_local_remote_servers --value true --type bool
 occ config:system:set gs.trustedHosts 0 --value "*${DOMAIN_SUFFIX}"
 occ richdocuments:activate-config
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash

 if [ -z "$1" ]
-then
-  CONTAINER=nextcloud
-else
-  CONTAINER=$1
+  then
+    echo "Usage $0 CONTAINER"
+	exit 1
 fi

+CONTAINER=$1
+
 function occ() {
    docker compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
 }
@@ -17,11 +18,4 @@ source .env
 echo "Setting up ONLYOFFICE with onlyoffice$DOMAIN_SUFFIX on $CONTAINER"
 docker-compose up -d onlyoffice
 occ app:enable onlyoffice --force
-occ config:app:set onlyoffice DocumentServerUrl --value="$PROTOCOL://onlyoffice$DOMAIN_SUFFIX"
-occ config:app:set onlyoffice jwt_secret --value="secret"
-occ config:app:set onlyoffice DocumentServerInternalUrl --value="http://onlyoffice/"
-occ config:app:set onlyoffice StorageUrl --value="http://nextcloud/"
-occ onlyoffice:documentserver --check
-
-
-docker-compose exec onlyoffice /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string'
+occ config:app:set onlyoffice DocumentServerUrl --value="http://onlyoffice$DOMAIN_SUFFIX"
@@ -8,6 +8,6 @@ OCC config:system:set enabledPreviewProviders 1 --value 'OC\Preview\TXT'
 OCC config:system:set enabledPreviewProviders 2 --value 'OC\Preview\MarkDown'
 OCC config:system:set enabledPreviewProviders 3 --value 'OC\Preview\OpenDocument'
 OCC config:system:set enabledPreviewProviders 4 --value 'OC\Preview\Krita'
-OCC config:system:set enabledPreviewProviders 5 --value 'OC\Preview\Imaginary'
+OCC config:system:set enabledPreviewProviders 4 --value 'OC\Preview\Imaginary'

-OCC config:system:set preview_imaginary_url --value 'http://previews_hpb:8088'
+OCC config:system:set preview_imaginary_url --value 'http://previews_hpb:8088'
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -z "$1" ]
-  then
-    echo "Usage $0 CONTAINER"
-	exit 1
-fi
-
-CONTAINER=$1
-
-function occ() {
-    docker compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
-}
-
-# shellcheck disable=SC1091
-source .env
-
-echo "Setting up talk signaling with http://talk-signaling$DOMAIN_SUFFIX on $CONTAINER"
-docker-compose up -d talk-signaling talk-janus
-
-if ! occ talk:signaling:list --output="plain" | grep -q "http://talk-signaling$DOMAIN_SUFFIX"; then
-  occ talk:signaling:add "http://talk-signaling$DOMAIN_SUFFIX" "1234"
-fi
-
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Default container name to operate on
-instance=${INSTANCE:-nextcloud}
-
-show_help() {
-    cat << EOF
-$0: Run commands in the database backend directly.
-Usage:
-    $0 [PARAMS] -- {MySQL Params}
-
-The PARAMS are interpreted by the wrapper script while the MySQL Params are forwarded literally to the database client.
-To separate the two lists, the double dash can be used.
-
-The following parameters are recognized by the wrapper:
-  --instance/-i INST     Use the database for the container INST. (Default: nextcloud)
-  --help/-h              Show this help and exit.
-EOF
-}
-
-run_mysql() {
-    docker compose exec database-mysql mysql -u nextcloud -pnextcloud "$instance" "$@"
-    exit $?
-}
-
-while [ $# -gt 0 ]
-do
-    case "$1" in
-        --instance|-i)
-            instance="$2"
-            # Additional shift
-            shift
-            ;;
-        --help|-h)
-            show_help
-            exit
-            ;;
-        --)
-            shift
-            run_mysql "$@"
-            ;;
-        *)
-            echo "Parameter $1 is not recognized. I assume this is for the mysql client."
-            run_mysql "$@"
-            ;;
-    esac
-
-    # Shift to the next parameter
-    shift
-done
-
-# No parameters were given.
-run_mysql
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Baptiste Fotia	60f5cefc19	feat(sh):Create 2 environment variables I create APPS and SERVER_GIT_WITH_ORGANIZATIO env var when we generate the .env file. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 15:38:57 +01:00
Baptiste Fotia	aac7883609	build(sh): Fix shellchecl add source=/dev/null Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 15:38:17 +01:00
Baptiste Fotia	71ff3f9ac0	fix(bash): Declare the source file for shellcheck Please, read the doc : https://www.shellcheck.net/wiki/SC1091 Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:40:22 +01:00
Baptiste Fotia	440daf474c	fix(bash): Shellcheck compliant I had an error with ShellCheck in the CI. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:32:27 +01:00
Baptiste Fotia	7c56999606	chore(): Add the my-apps folder in the gitignore Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:23:46 +01:00
Baptiste Fotia	cc1d2021c3	feat(yaml,sh,env): Centralise the apps folder This feature centralise the apps folder for the end user (dev). We don't need to clone our apps for each nextcloud releases. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:20:35 +01:00
				`@@ -1 +0,0 @@`
				`nextcloud.local:5432:database-postgres:postgres:postgres`