Merge pull request #468 from Antreesy/fix/noid/rustfs-docs-for-34

fix(s3): adjust rustfs setup documentation

.github/workflows/docker.yml

@@ -15,11 +15,13 @@ jobs:
   push_to_registry:
     name: Build image
     runs-on: ubuntu-latest
-    if: github.repository == 'juliushaertl/nextcloud-docker-dev'
+    if: github.repository == 'juliusknorr/nextcloud-docker-dev'
     strategy:
       fail-fast: false
       matrix:
         container:
+          - php85
+          - php84
           - php83
           - php82
           - php81
@@ -32,6 +34,7 @@ jobs:
           - saml
           - nginx
           - elasticsearch
+          - keycloak
           - mailhog
           - ldap
           - lookupserver
@@ -39,25 +42,26 @@ jobs:
           - codedev
           - code
           - talk-janus
+          - noop
     permissions:
       packages: write
       contents: read
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         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@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -71,26 +75,41 @@ jobs:
           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@v7
         with:
           push: false
           context: docker/
           platforms: linux/amd64,linux/arm64
           file: ${{ steps.dockerfile.outputs.DOCKERFILE }}
           tags: |
-            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}:${{ github.sha }}
+            ghcr.io/juliusknorr/nextcloud-dev-${{ matrix.container }}:${{ github.sha }}
+            ghcr.io/juliusknorr/nextcloud-dev-${{ matrix.container }}:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+      - name: Push container image
+        uses: docker/build-push-action@v7
+        if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        with:
+          push: true
+          context: docker/
+          platforms: linux/amd64,linux/arm64
+          file: ${{ steps.dockerfile.outputs.DOCKERFILE }}
+          tags: |
+            ghcr.io/juliusknorr/nextcloud-dev-${{ matrix.container }}:${{ github.event_name == 'release' && 'release' || 'latest' }}
+            ghcr.io/juliusknorr/nextcloud-dev-${{ matrix.container }}:${{ github.ref_name }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
       - name: Start containers with docker compose
+        if: matrix.container == 'php82' || matrix.container == 'php83' || matrix.container == 'php84'
         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 if php version is not numeric or below 80 or above 84 to only test against supported ones in server master
+          if ! [[ $PHP_VERSION =~ ^[0-9]+$ ]] || [[ $PHP_VERSION -lt 80 ]] || [[ $PHP_VERSION -gt 84 ]]; then
             exit 0
           fi
-          docker-compose up -d nextcloud
+          docker compose up -d nextcloud
           # wait for nextcloud to be up
           # wait up to 5 minutes
           for i in {1..300}; do
@@ -100,42 +119,29 @@ jobs:
             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'
+      - uses: actions/setup-node@v6
+        if: matrix.container == 'php82' || matrix.container == 'php83' || matrix.container == 'php84'
         with:
-          node-version: 18
+          node-version: latest
       - name: Install dependencies
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
+        if: matrix.container == 'php82' || matrix.container == 'php83' || matrix.container == 'php84'
         working-directory: tests
         run: npm ci
       - name: Install Playwright Browsers
-        if: matrix.container == 'php80' || matrix.container == 'php81' || matrix.container == 'php82' || matrix.container == 'php83'
+        if: matrix.container == 'php82' || matrix.container == 'php83' || matrix.container == 'php84'
         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'
+        if: matrix.container == 'php82' || matrix.container == 'php83' || matrix.container == 'php84'
         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'
+      - uses: actions/upload-artifact@v6
+        if: matrix.container == 'php82' || matrix.container == 'php83' || matrix.container == 'php84'
         with:
-          name: playwright-report
+          name: playwright-report-${{ matrix.container }}
           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'
-        with:
-          push: true
-          context: docker/
-          platforms: linux/amd64,linux/arm64
-          file: ${{ steps.dockerfile.outputs.DOCKERFILE }}
-          tags: |
-            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}:${{ github.event_name == 'release' && 'latest' || 'nightly' }}
-            ghcr.io/juliushaertl/nextcloud-dev-${{ matrix.container }}:${{ github.ref_name }}
-          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

.github/workflows/docs.yml

@@ -28,11 +28,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Install dependencies
@@ -42,10 +42,10 @@ jobs:
       - name: Build MkDocs
         run: mkdocs build
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v4
         with:
           # Upload entire repository
           path: './site'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/shellcheck.yml

@@ -11,6 +11,8 @@ jobs:
     name: Shellcheck
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Run ShellCheck
       uses: ludeeus/action-shellcheck@master
+      env:
+        SHELLCHECK_OPTS: -x

.gitignore

@@ -1,4 +1,5 @@
 /.vscode
+/data/nginx/vhost.d/
 /data/ssl/
 /data/shared/
 /workspace/
@@ -13,3 +14,5 @@ node_modules/
 /tests/playwright-report/
 /tests/blob-report/
 /tests/playwright/.cache/
+/.idea/
+.DS_Store

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

Makefile

@@ -9,29 +9,29 @@ images: docker/*/Dockerfile docker/Dockerfile.*
 pull-all:
 	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}"; \
+		echo "=> Pulling image $$NAME"; docker pull "ghcr.io/juliusknorr/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}"; \
+		echo "=> Pulling image $$NAME"; docker pull "ghcr.io/juliusknorr/nextcloud-dev-$${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
+	docker image ls | grep juliusknorr/nextcloud-dev | cut -f 1 -d " "
+	docker image ls | grep juliusknorr/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 .)
+	echo "=> Building dockerfile" $@ as ghcr.io/juliusknorr/nextcloud-dev-$$NAME:latest; \
+	(cd docker && docker build -t ghcr.io/juliusknorr/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 .)
+	echo "=> Building dockerfile" $@ as ghcr.io/juliusknorr/nextcloud-dev-$$NAME:latest; \
+	(cd docker && docker build -t ghcr.io/juliusknorr/nextcloud-dev-$$NAME:latest -f Dockerfile.$$NAME .)
 
 check: dockerfilelint shellcheck
 
@@ -42,8 +42,8 @@ dockerfilelint:
 
 .ONESHELL:
 shellcheck:
-	for file in $$(find . -type f -iname '*.sh' -not -path './wip/*'); do shellcheck --format=gcc $$file; done;
-	for file in $$(find ./scripts -type f); do shellcheck --format=gcc $$file; done;
+	for file in $$(find . -type f -iname '*.sh' -not -path './wip/*'); do shellcheck --format=gcc -x $$file; done;
+	for file in $$(find ./scripts -type f); do shellcheck --format=gcc -x $$file; done;
 
 .ONESHELL:
 template-apply:
@@ -55,6 +55,8 @@ template-apply:
 	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
+	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:8.4/' > docker/php84/Dockerfile
+	cat docker/Dockerfile.php.template | sed 's/php:8.2/php:8.5/' > docker/php85/Dockerfile
 
 docs:
 	pip3 install mkdocs

README.md

@@ -1,6 +1,8 @@
 # Nextcloud development environment on Docker Compose
 
-Nextcloud development environment using docker-compose providing a large variety of services for Nextcloud server and app development and testing.
+[Documentation](https://juliusknorr.github.io/nextcloud-docker-dev/) | [Nextcloud Developer Portal](https://nextcloud.com/developer/)
+
+Nextcloud's 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
 
@@ -16,9 +18,9 @@ Nextcloud development environment using docker-compose providing a large variety
 
 ## Tutorial
 
-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
+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
 
-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/).
+In detail explanation of the setup and its features and configuration options can be found in the [nextcloud-docker-dev documentation](https://juliusknorr.github.io/nextcloud-docker-dev/).
 
 ## Quickstart
 
@@ -27,23 +29,25 @@ In detail explanation of the setup and its features and configuration options ca
 > [!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.
+To start the setup run the following commands to clone the repository and bootstrap the setup. This will prepare your setup and clone the Nextcloud server repository and required apps into the `workspace` folder.
 ```bash
-git clone https://github.com/juliushaertl/nextcloud-docker-dev
+git clone https://github.com/juliusknorr/nextcloud-docker-dev
 cd nextcloud-docker-dev
 ./bootstrap.sh
 ```
 
+Depending on your docker version you will need to use `docker-compose` instead of `docker compose` in the following commands.
+
 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
+docker compose up nextcloud
 ```
 
-You can also start it in the background using `docker-compose up -d 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).
+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://juliusknorr.github.io/nextcloud-docker-dev/basics/overview/#default-users).
 
 > [!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:
@@ -70,30 +74,30 @@ 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
+docker run --rm -p 8080:80 ghcr.io/juliusknorr/nextcloud-dev-php81: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
+docker run --rm -p 8080:80 -v ~/path/to/appid:/var/www/html/apps-extra/appid ghcr.io/juliusknorr/nextcloud-dev-php81:latest
 ```
 
-The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specificing either a server branch or git tag.
+The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specifying 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
+docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 ghcr.io/juliusknorr/nextcloud-dev-php81: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
+docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 -v /tmp/server:/var/www/html ghcr.io/juliusknorr/nextcloud-dev-php81: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:
+You can find documentation for more advanced features in [nextcloud-docker-dev documentation](https://juliusknorr.github.io/nextcloud-docker-dev/) for example:
 
 - Running stable Nextcloud versions in parallel
 - Using different database backends
-- Using HTTPS
+- Using HTTPS

bootstrap.sh

@@ -11,7 +11,7 @@ APPS_CLONE_FILTER=
 
 print_help() {
 	cat << EOF
-  boottrap.sh [--full-clone|--clone-no-blobs] [--clone-all-apps-filtered] [--] APPS
+  bootstrap.sh [--full-clone|--clone-no-blobs] [--clone-all-apps-filtered] [--] APPS
 
 This command will initialize the debug environment for app developers.
 
@@ -25,7 +25,7 @@ The following options can be provided:
   --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[@]}
@@ -82,7 +82,7 @@ if [ -f ".env" ]; then
 		echo "❌ Repository path does not exist"
 	fi
 
-	for i in stable26 stable27 stable28
+	for i in stable29 stable30 stable31 stable32 stable33
 	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)
@@ -102,7 +102,7 @@ case $SERVER_CLONE in
 	squashed)
 		CLONE_PARAMS=(--depth 1)
 		;;
-	clone-no-blobs)
+	filter-blobs)
 		CLONE_PARAMS=(--filter blob:none)
 		;;
 	full)
@@ -141,7 +141,7 @@ function install_server() {
 	(
 		(
 			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 &&
+				git clone ${CLONE_PARAMS[@]+"${CLONE_PARAMS[@]}"} https://github.com/nextcloud/server.git workspace/server --progress 2>&1 &&
 				cd workspace/server && git submodule update --init --progress 2>&1
 		) || echo "❌ Failed to clone Nextcloud server code"
 	) | indent
@@ -155,7 +155,7 @@ function install_app() {
 	fi
 	(
 		echo "🌏 Fetching $1"
-		(git clone "${APPS_CLONE_PARAMS[@]}" https://github.com/nextcloud/"$1".git "$TARGET" 2>&1 | indent_cli &&
+		(git clone ${APPS_CLONE_PARAMS[@]+"${APPS_CLONE_PARAMS[@]}"} https://github.com/nextcloud/"$1".git "$TARGET" 2>&1 | indent_cli &&
 			echo "✅ $1 installed") ||
 			echo "❌ Failed to install $1"
 	) | indent
@@ -176,9 +176,17 @@ echo
 echo "⏩ Performing system checks"
 
 is_installed docker
-is_installed docker-compose
 is_installed git
 
+DCC=
+docker-compose version >/dev/null 2>/dev/null && DCC='docker-compose'
+docker compose version >/dev/null 2>/dev/null && DCC='docker compose'
+
+if [ -z "$DCC" ]; then
+	echo "❌ Install docker-compose before running this script"
+	exit 1
+fi
+
 (
 	(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)
@@ -193,15 +201,16 @@ cat <<EOT >.env
 COMPOSE_PROJECT_NAME=master
 PROTOCOL=http
 DOMAIN_SUFFIX=.local
-REPO_PATH_SERVER=$PWD/workspace/server
-STABLE_ROOT_PATH=$PWD/workspace
+REPO_PATH_SERVER="$PWD/workspace/server"
+STABLE_ROOT_PATH="$PWD/workspace"
 NEXTCLOUD_AUTOINSTALL_APPS="${NEXTCLOUD_AUTOINSTALL_APPS[@]}"
 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"
+PRIMARY=local
+# other values: "database-pgsql"
 EOT
 fi
 
@@ -232,17 +241,17 @@ cat <<EOF
 
  🚀  Start the Nextcloud server by running
 
-	$ docker-compose up -d nextcloud
+	$ $DCC up -d nextcloud
 
 
  💤  Stop it with
 
-	$ docker-compose stop nextcloud
+	$ $DCC stop nextcloud
 
 
  🗑  Fresh install and wipe all data
 
-	$ docker-compose down -v
+	$ $DCC down -v
 EOF
 
 case $SERVER_CLONE in
@@ -286,5 +295,5 @@ cat <<EOF
 
 For more details about the individual setup options see
 the README.md file or checkout the repo at
-https://github.com/juliushaertl/nextcloud-docker-dev
+https://github.com/juliusknorr/nextcloud-docker-dev
 EOF

data/pgadmin/config/pgpassfile

@@ -1 +1 @@
-nextcloud.local:5432:database-postgres:postgres:postgres
+nextcloud.local:5432:database-pgsql:postgres:postgres

data/pgadmin/config/servers.json

@@ -5,7 +5,7 @@
             "Group": "Server Group 1",
             "Port": 5432,
             "Username": "postgres",
-            "Host": "database-postgres",
+            "Host": "database-pgsql",
             "SSLMode": "prefer",
             "MaintenanceDB": "postgres",
             "PassFile": "/pgadmin4/config/pgpassfile"

docker/Dockerfile.php.template

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -25,25 +24,42 @@ RUN install-php-extensions \
     sysvsem \
     xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/Dockerfile.php71

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -25,25 +24,42 @@ RUN install-php-extensions \
     sysvsem \
     xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/Dockerfile.php72

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -25,25 +24,42 @@ RUN install-php-extensions \
     sysvsem \
     xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/Dockerfile.php73

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -25,25 +24,42 @@ RUN install-php-extensions \
     sysvsem \
     xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/Dockerfile.php74

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -25,25 +24,42 @@ RUN install-php-extensions \
     sysvsem \
     xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/Dockerfile.php80

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -25,25 +24,42 @@ RUN install-php-extensions \
     sysvsem \
     xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/Dockerfile.php81

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -23,27 +22,44 @@ RUN install-php-extensions \
     redis \
     smbclient \
     sysvsem \
-    xdebug-^3.2 \
+    xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/bin/bootstrap.sh

@@ -41,6 +41,11 @@ OCC() {
 	sudo -E -u www-data php "$WEBROOT/occ" $@ | indent
 }
 
+is_installed() {
+	STATUS=$(OCC status)
+	[[ "$STATUS" = *"installed: true"* ]] 
+}
+
 update_permission() {
 	chown -R www-data:www-data "$WEBROOT"/apps-writable
 	chown -R www-data:www-data "$WEBROOT"/data
@@ -86,7 +91,7 @@ wait_for_other_containers() {
 			sleep 2
 			;;
 		"pgsql")
-			retry_with_timeout "(echo > /dev/tcp/database-postgres/5432) 2>/dev/null" 30 "⚠ Unable to connect to the PostgreSQL server"
+			retry_with_timeout "(echo > /dev/tcp/database-pgsql/5432) 2>/dev/null" 30 "⚠ Unable to connect to the PostgreSQL server"
 			sleep 2
 			;;
 		"maxscale")
@@ -97,6 +102,14 @@ wait_for_other_containers() {
 				echo "✅"
 			done
 			;;
+		"oci")
+			output " - Oracle"
+			retry_with_timeout "(echo > /dev/tcp/database-$SQL/1521) 2>/dev/null" 30 "⚠ Unable to connect to the Oracle server"
+			sleep 45
+			;;
+		"sqlite")
+			output " - SQLite"
+			;;
 		*)
 			fatal 'Not implemented'
 			;;
@@ -214,7 +227,11 @@ configure_add_user() {
 
 
 install() {
-	DBNAME=$(echo "$VIRTUAL_HOST" | cut -d '.' -f1)
+	if [ -n "$VIRTUAL_HOST" ]; then
+		DBNAME=$(echo "$VIRTUAL_HOST" | cut -d '.' -f1)
+	else
+		DBNAME="nextcloud"
+	fi
 	SQLHOST="database-$SQL"
 	echo "database name will be $DBNAME"
 
@@ -225,7 +242,7 @@ install() {
 
 	output "🔧 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=FREE --database-host="$SQLHOST" --database-port=1521 --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
 	elif [ "$SQL" = "mysql" ]; then
@@ -242,7 +259,14 @@ install() {
 		OCC maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database="$SQL"
 	fi;
 
-	output "🔧 Server installed"
+	if is_installed
+	then
+		output "🔧 Server installed"
+	else
+		output "Last nextcloud.log entry:"
+		output "$(tail -n 1 "$WEBROOT"/data/nextcloud.log | jq)"
+		fatal "🚨 Server installation failed."
+	fi
 
 	output "🔧 Provisioning apps"
 	OCC app:disable password_policy
@@ -293,6 +317,8 @@ install() {
 
 	output "🔧 Preparing cron job"
 
+	OCC dav:sync-system-addressbook
+
 	# Setup initial configuration
 	OCC background:cron
 
@@ -346,8 +372,8 @@ add_hosts() {
 setup() {
 	update_permission
 	configure_xdebug_mode
-	STATUS=$(OCC status)
-	if [[ "$STATUS" = *"installed: true"* ]] || [[ ! -f $WEBROOT/config/config.php ]]
+
+	if is_installed || [[ ! -f $WEBROOT/config/config.php ]]
 	then
 		output "🚀 Nextcloud already installed ... skipping setup"
 
@@ -377,8 +403,8 @@ check_source() {
 	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 ]
+		# Only autoinstall when not running in docker compose
+		if [ -n "$VIRTUAL_HOST" ] && [ ! -f "$WEBROOT"/version.php ]
 		then
 			output "======================================================================================="
 			output " 🚨 Could not find a valid Nextcloud source in $WEBROOT                                "

docker/codedev/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ubuntu:22.04
+FROM --platform=linux/amd64 ubuntu:24.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 \

docker/configs/autoconfig_pgsql.php

@@ -2,7 +2,7 @@
 
 $AUTOCONFIG = [
   'dbname' => 'nextcloud',
-  'dbhost' => 'database-postgres',
+  'dbhost' => 'database-pgsql',
   'dbuser' => 'postgres',
   'dbpass' => 'postgres',
   'dbtype' => 'pgsql'

docker/configs/default.config.php

@@ -67,3 +67,91 @@ $CONFIG=[
         'apps' => ['diagnostics', 'admin_audit'],
 	],
 ];
+
+
+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,
+			),
+		),
+	];
+}
+
+
+if ($primary === 'rustfs') {
+	$CONFIG += [
+		'objectstore' =>
+		array (
+			'class' => 'OC\\Files\\ObjectStore\\S3',
+			'arguments' =>
+			array (
+				'bucket' => 'nc-' . $hostname,
+				'key' => 'nextcloud',
+				'secret' => 'nextcloud',
+				'hostname' => 'rustfs.local',
+				'port' => '80',
+				'proxy' => 'rustfs:9000',
+				'use_ssl' => false,
+				'use_path_style' => true,
+				'use_presigned_url' => true,
+				'autocreate' => true,
+				'verify_bucket_exists' => true,
+			),
+		)
+	];
+}
+
+if ($primary === 'rustfs-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' => 'rustfs.local',
+				'port' => '80',
+				'proxy' => 'rustfs:9000',
+				'use_presigned_url' => true,
+				'use_ssl' => false,
+				'use_path_style' => true,
+			),
+		),
+	];
+}

docker/configs/php/nextcloud.ini

@@ -10,3 +10,6 @@ opcache.revalidate_freq=1
 
 apc.enable_cli=1
 memory_limit=512M
+
+upload_max_filesize=512M
+post_max_size=512M

docker/configs/storage.config.php

@@ -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,
-			),
-		),
-	];
-}

docker/configs/var-simplesamlphp/config/config.php

@@ -21,7 +21,7 @@ $config = array(
      * external url, no matter where you come from (direct access or via the
      * reverse proxy).
      */
-    'baseurlpath' => 'https://sso.local.dev.bitgrid.net/simplesaml/',
+    'baseurlpath' => 'https://sso.local/simplesaml/',
     'certdir' => 'cert/',
     'loggingdir' => 'log/',
     'datadir' => 'data/',

docker/configs/var-simplesamlphp/metadata/saml20-sp-remote.php

@@ -1,6 +1,6 @@
 <?php
-$metadata['https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/metadata'] = array (
-    'entityid' => 'https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/metadata',
+$metadata['https://nextcloud.local/index.php/apps/user_saml/saml/metadata'] = array (
+    'entityid' => 'https://nextcloud.local/index.php/apps/user_saml/saml/metadata',
     'contacts' => 
     array (
     ),
@@ -11,7 +11,7 @@ $metadata['https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml
       0 => 
       array (
         'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-        'Location' => 'https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/acs',
+        'Location' => 'https://nextcloud.local/index.php/apps/user_saml/saml/acs',
         'index' => 1,
       ),
     ),
@@ -20,7 +20,7 @@ $metadata['https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml
       0 => 
       array (
         'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        'Location' => 'https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml/sls',
+        'Location' => 'https://nextcloud.local/index.php/apps/user_saml/saml/sls',
       ),
     ),
     'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
@@ -36,4 +36,4 @@ $metadata['https://nextcloud.local.dev.bitgrid.net/index.php/apps/user_saml/saml
     ),
     'validate.authnrequest' => false,
     'saml20.sign.assertion' => false,
-  );
+  );

docker/data/installing.html

@@ -1,75 +1,106 @@
 <!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>
+<head>
+    <meta http-equiv="refresh" content="1" />
+    <meta charset="utf-8">
+    <style>
+        :root {
+            --font-color: #333;
+            --background-color: #fff;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            :root {
+                --font-color: #eee;
+                --background-color: #1a1a1a;
+            }
+        }
+
+        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: 800px;
+            color: var(--font-color);
+            background-color: var(--background-color);
+        }
+
+        .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: var(--font-color);
+            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>

docker/elasticsearch/Dockerfile

@@ -1,3 +1,3 @@
-FROM elasticsearch:7.17.14
+FROM elasticsearch:7.17.25
 
 RUN bin/elasticsearch-plugin install --batch ingest-attachment

docker/keycloak/Dockerfile

@@ -0,0 +1,9 @@
+FROM quay.io/keycloak/keycloak:26.4
+
+RUN mkdir -p /opt/keycloak/data/import
+
+ADD keycloak/Example-realm.json /opt/keycloak/data/import/Example-realm.json
+
+ADD keycloak/prepare.sh /opt/keycloak/bin/custom-kc.sh
+
+ENTRYPOINT ["/opt/keycloak/bin/custom-kc.sh"]

docker/keycloak/Example-realm.json

@@ -511,7 +511,7 @@
         "containerId" : "6b350bb7-8ea6-438b-be38-fb58f6523f45",
         "attributes" : { }
       } ],
-      "http://nextcloud.dev.local/index.php/apps/user_saml/saml/metadata" : [ ]
+      "http://nextcloud.local/index.php/apps/user_saml/saml/metadata" : [ ]
     }
   },
   "groups" : [ ],
@@ -689,15 +689,15 @@
     "optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
   }, {
     "id" : "555c2809-b153-4cf4-8bb1-a6306e5179c7",
-    "clientId" : "http://nextcloud.dev.local/index.php/apps/user_saml/saml/metadata",
-    "adminUrl" : "http://keycloak.dev.local/auth/realms/Example",
+    "clientId" : "http://nextcloud.local/index.php/apps/user_saml/saml/metadata",
+    "adminUrl" : "http://keycloak.local/auth/realms/Example",
     "surrogateAuthRequired" : false,
     "enabled" : true,
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
     "secret" : "FipRMpAHMklMkZtbQfAKkUhxe7gkRZzR",
-    "redirectUris" : [ "http://nextcloud.dev.local/index.php/apps/user_saml/saml/acs" ],
-    "webOrigins" : [ "http://nextcloud.dev.local" ],
+    "redirectUris" : [ "http://nextcloud.local/index.php/apps/user_saml/saml/acs" ],
+    "webOrigins" : [ "http://nextcloud.local" ],
     "notBefore" : 0,
     "bearerOnly" : false,
     "consentRequired" : false,
@@ -713,12 +713,12 @@
       "client.secret.creation.time" : "1670752721",
       "saml.force.post.binding" : "true",
       "post.logout.redirect.uris" : "+",
-      "saml_assertion_consumer_url_post" : "http://nextcloud.dev.local/index.php/apps/user_saml/saml/acs",
+      "saml_assertion_consumer_url_post" : "http://nextcloud.local/index.php/apps/user_saml/saml/acs",
       "saml.server.signature" : "true",
       "saml.server.signature.keyinfo.ext" : "false",
       "saml.signing.certificate" : "MIICvjCCAaYCCQDS+w+GXVpJsDANBgkqhkiG9w0BAQsFADAhMQswCQYDVQQGEwJERTESMBAGA1UECgwJZGV2LmxvY2FsMB4XDTIyMTIxMDA1MjgxMloXDTIzMDEwOTA1MjgxMlowITELMAkGA1UEBhMCREUxEjAQBgNVBAoMCWRldi5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXPQ1YfI0aNUJEVdqFprGGtVMCZ5WIQsk7elS2KqljCHFX6eqpFR8FrQoZgcDVsi4zjX85bAdCPAW2ikfk5hNOypeJx1WSr7mtg/60p0m/T5Lim4QBCyItSARYulV9KYEijIYadTiFQJRE0PJKijlyOZ69FRt3lG+3vqE5xgQc+ZA59Pex7fB/R9jWwORxRMrzZQDP7cvKkvOlq13mR5WbCQkLXG0n6Fd2/Av27TNEP8gkITUlkrv7DkKoHcBRpUGLBuod+C/GM9aZYXxtlIStyIkz27ulsU7+VdNympFkEL+vzRrptW/S0C0RT4xKBbFeA+pCwgoIMeJsnBaAP2OkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAOJ3+a1d06LN83gh3iNEvwWNudKVPi7MvyltW2WVBzQBoN2wCYC0crl7PRxXqACvpw2nE2qZaJ0KrrbVWUVMf2lAwRKk4g2F3WcwBjqakWwWEgIDuocLt1WX5nHbI6hb9E2jAwa8wpYbAiRQF5HnZGxI+1ZXKROZvhOPIiAVTv4jTPGr5lgxJ1lKqnVRfKIHZlPWPFGTmuwSkuq+9lwqp/HdCOIiV54c5yi0XBMvEjLhqoE5cxSVNswLF7thD7B2E1NTpyH83Z7rHtK/HDHinUVfOTKhnt15JAf2I2zwh9HErW/Bz4zQlmmBL0uMpgOjTix9h55p2JMuM7/Bd7ng2Dg==",
       "saml.artifact.binding.identifier" : "0TDhGxUTNYmRM8Yd/PcR55vLtAs=",
-      "saml_single_logout_service_url_redirect" : "http://nextcloud.dev.local/index.php/apps/user_saml/saml/sls",
+      "saml_single_logout_service_url_redirect" : "http://nextcloud.local/index.php/apps/user_saml/saml/sls",
       "saml.signature.algorithm" : "RSA_SHA256",
       "saml_force_name_id_format" : "false",
       "saml.client.signature" : "true",
@@ -775,15 +775,15 @@
   }, {
     "id" : "a7bab497-e991-491b-aae2-785f049cf361",
     "clientId" : "nextcloud",
-    "rootUrl" : "https://nextcloud.dev.local",
-    "adminUrl" : "https://nextcloud.dev.local",
+    "rootUrl" : "http://nextcloud.local",
+    "adminUrl" : "http://nextcloud.local",
     "surrogateAuthRequired" : false,
     "enabled" : true,
     "alwaysDisplayInConsole" : false,
     "clientAuthenticatorType" : "client-secret",
     "secret" : "09e3c268-d8bc-42f1-b7c6-74d307ef5fde",
-    "redirectUris" : [ "https://nextcloud.dev.local/*" ],
-    "webOrigins" : [ "https://nextcloud.dev.local" ],
+    "redirectUris" : [ "http://nextcloud.local/*" ],
+    "webOrigins" : [ "http://nextcloud.local" ],
     "notBefore" : 0,
     "bearerOnly" : false,
     "consentRequired" : false,

docker/keycloak/prepare.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+KEYCLOAK_REALM_CONFIG="/opt/keycloak/data/import/Example-realm.json"
+PROTOCOL="${PROTOCOL:-http}"
+NEXTCLOUD_URL=${PROTOCOL}://${NEXTCLOUD_URL:-nextcloud}${DOMAIN_SUFFIX}
+KEYCLOAK_URL=${PROTOCOL}://${KEYCLOAK_URL:-keycloak}${DOMAIN_SUFFIX}
+
+if [ -f "$KEYCLOAK_REALM_CONFIG" ]; then
+    echo "Preparing Keycloak realm configuration..."
+
+    echo "Using NEXTCLOUD_URL: ${NEXTCLOUD_URL}"
+    echo "Using KEYCLOAK_URL: ${KEYCLOAK_URL}"
+
+    # Replace placeholder with actual NEXTCLOUD_URL
+    sed -i.bak "s|http://nextcloud\\.local|${NEXTCLOUD_URL//./\\.}|g" "$KEYCLOAK_REALM_CONFIG"
+    sed -i.bak "s|http://keycloak\\.local|${KEYCLOAK_URL//./\\.}|g" "$KEYCLOAK_REALM_CONFIG"
+    rm -f "${KEYCLOAK_REALM_CONFIG}.bak"
+
+    cat "$KEYCLOAK_REALM_CONFIG"
+
+    echo "Realm configuration prepared."
+else
+    echo "Realm configuration file not found: $KEYCLOAK_REALM_CONFIG"
+fi
+
+exec /opt/keycloak/bin/kc.sh "$@"

docker/lookupserver/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DBPASSWD=abrakadabra

docker/nginx/my_proxy.conf

@@ -5,4 +5,11 @@ proxy_read_timeout 3600;
 proxy_send_timeout 3600;
 proxy_connect_timeout 3600;
 
-proxy_set_header X-Forwarded-Proto $scheme;
+#proxy_http_version 1.1;
+#proxy_set_header Upgrade $http_upgrade;
+#proxy_set_header Connection "Upgrade";
+
+proxy_set_header X-Forwarded-Proto https;
+# FIXME: remove this when onlyoffice is fixed https to http proxying
+# https://github.com/ONLYOFFICE/DocumentServer/issues/2186
+proxy_set_header CloudFront-Forwarded-Proto $scheme;

docker/noop/Dockerfile

@@ -0,0 +1,11 @@
+# VERSION 0.1.0
+# Based on https://github.com/JanNash/docker_noop
+
+FROM alpine:latest AS builder
+COPY noop/noop.c /
+RUN apk add --no-cache gcc musl-dev && gcc -static -o /noop /noop.c
+
+FROM scratch
+
+COPY --from=builder /noop /noop
+CMD ["/noop"]

docker/noop/noop.c

@@ -0,0 +1,5 @@
+#include <stdlib.h>
+
+int main() {
+	exit(0);
+}

docker/php82/Dockerfile

@@ -7,11 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    imagick \
     intl \
     ldap \
     memcached \
@@ -23,27 +22,44 @@ RUN install-php-extensions \
     redis \
     smbclient \
     sysvsem \
-    xdebug-^3.2 \
+    xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -62,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -85,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/php83/Dockerfile

@@ -7,12 +7,10 @@ RUN chmod +x /usr/local/bin/install-php-extensions
 RUN install-php-extensions \
     apcu \
     bcmath \
-    blackfire \
+    excimer \
     exif \
     gd \
     gmp \
-    # waiting for https://github.com/mlocati/docker-php-extension-installer/pull/811
-    # imagick \
     intl \
     ldap \
     memcached \
@@ -24,27 +22,44 @@ RUN install-php-extensions \
     redis \
     smbclient \
     sysvsem \
-    # xdebug \
+    xdebug \
     zip \
+    blackfire \
     @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 \
+    git \
+    curl \
+    vim-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
     && 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
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
 
 # 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
+    && nvm install node \
+    && nvm alias default node \
+    && nvm cache clear
 
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json
 
@@ -63,15 +78,7 @@ 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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
 
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
@@ -86,16 +93,16 @@ 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 SQL=sqlite
+ENV NEXTCLOUD_AUTOINSTALL=YES
+ENV WITH_REDIS=NO
 
-ENV WEBROOT /var/www/html
+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 configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/default.config.php configs/redis.config.php configs/apcu.config.php /root/
 ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/php84/Dockerfile

@@ -0,0 +1,108 @@
+FROM php:8.4-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 \
+    excimer \
+    exif \
+    gd \
+    gmp \
+    intl \
+    ldap \
+    memcached \
+    oci8 \
+    opcache \
+    pcntl \
+    pdo_mysql \
+    pdo_pgsql \
+    redis \
+    smbclient \
+    sysvsem \
+    xdebug \
+    zip \
+    blackfire \
+    @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-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install PHPUnit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
+
+# 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 node \
+    && nvm alias default node \
+    && nvm cache clear
+
+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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
+
+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/redis.config.php configs/apcu.config.php /root/
+ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/php85/Dockerfile

@@ -0,0 +1,108 @@
+FROM php:8.5-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 \
+    excimer \
+    exif \
+    gd \
+    gmp \
+    intl \
+    ldap \
+    memcached \
+    oci8 \
+    opcache \
+    pcntl \
+    pdo_mysql \
+    pdo_pgsql \
+    redis \
+    smbclient \
+    sysvsem \
+    xdebug \
+    zip \
+    blackfire \
+    @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-tiny \
+    nano \
+    sudo \
+    cron \
+    smbclient \
+    iproute2 \
+    lnav \
+    wget \
+    iputils-ping \
+    gnupg2 \
+    jq \
+    ripgrep \
+    rsync \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install PHPUnit
+RUN wget -O /usr/local/bin/phpunit11 https://phar.phpunit.de/phpunit-11.phar \
+    && chmod +x /usr/local/bin/phpunit11 \
+    && wget -O /usr/local/bin/phpunit12 https://phar.phpunit.de/phpunit-12.phar \
+    && chmod +x /usr/local/bin/phpunit12 \
+    && ln -s /usr/local/bin/phpunit11 /usr/local/bin/phpunit
+
+# 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 node \
+    && nvm alias default node \
+    && nvm cache clear
+
+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 mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled
+
+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/redis.config.php configs/apcu.config.php /root/
+ADD bin/bootstrap.sh bin/occ /usr/local/bin/

docker/push/Dockerfile

@@ -1,6 +1,10 @@
 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
+RUN apk add curl jq \
+  && latest_tag=$(curl -Ls https://api.github.com/repos/nextcloud/notify_push/releases/latest | jq -r '.tag_name') \
+  && wget https://github.com/nextcloud/notify_push/releases/download/${latest_tag}/notify_push-`uname -m`-unknown-linux-musl -O /notify_push \
+  && chmod +x /notify_push \
+  && /notify_push --version
 
 EXPOSE 7867
 

docs/basics/getting-started.md

@@ -2,7 +2,7 @@
 
 ## 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.
+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.
 
@@ -11,24 +11,28 @@ There are two ways of using this setup. **A persistent setup is the most common
 !!! 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.
+To start the setup run the following commands to clone the repository and bootstrap the setup. This will prepare your setup and clone the Nextcloud server repository and required apps into the `workspace` folder.
 ```bash
-git clone https://github.com/juliushaertl/nextcloud-docker-dev
+git clone https://github.com/juliusknorr/nextcloud-docker-dev
 cd nextcloud-docker-dev
 ./bootstrap.sh
 ```
 
+There are some options to simplify the later development by cloning not only the minimal data set but a bigger one that helps with later switching of branches etc.
+See also the [detailed page](nc-history.md) for an overview of the options.
+
 This may take some time depending on your internet connection speed.
 
+Depending on your docker version you will need to use `docker-compose` instead of `docker compose` in the following commands.
 
 Once done you can start the Nextcloud container using:
 ```bash
-docker-compose up nextcloud
+docker compose up nextcloud
 ```
 
-You can also start it in the background using `docker-compose up -d 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).
+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://juliusknorr.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:
@@ -55,23 +59,23 @@ 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
+docker run --rm -p 8080:80 ghcr.io/juliusknorr/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
+docker run --rm -p 8080:80 -v ~/path/to/appid:/var/www/html/apps-extra/appid ghcr.io/juliusknorr/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.
+The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specifying 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
+docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 ghcr.io/juliusknorr/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
-```
+docker run --rm -p 8080:80 -e SERVER_BRANCH=v24.0.1 -v /tmp/server:/var/www/html ghcr.io/juliusknorr/nextcloud-dev-php80:latest
+```

docs/basics/hostnames.md

@@ -4,7 +4,7 @@
 
 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:
+You can do this by running the following command, which will automatically update entries:
 
 ```bash
 ./scripts/update-hosts.sh
@@ -33,9 +33,9 @@ docker run --rm -it \
     drpsychick/dnsmasq:latest 
 ```
 
-## Use DNS Service Discovery on MacOS
+## 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:
+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

docs/basics/nc-history.md

@@ -0,0 +1,69 @@
+# Nextcloud server with history
+
+The script `bootstrap.sh` will download a clone of the server code repository.
+Depending on your use case, you might be interested in having the complete or a partial history of the Nextcloud server at your fingertips.
+
+## TL;DR
+
+If you want to have a quick and dirty solution to just bootstrap the dev environment, just use `./bootstrap.sh`.
+If you want to intensively work on the server, use `./bootstrap.sh --full-clone`.
+If you want to switch from time to time between server versions and save bandwidth/storage, use `./bootstrap.sh --clone-no-blobs`.
+
+## Clone with depth one by default
+
+If you do not provide any additional information to the bootstrap script, it will truncate the history of the server repository.
+This truncation is done after exactly one commit.
+That means the clone you will get will contain exactly this single commit.
+
+!!! info
+    This will create a clone with `--depth 1`.
+    See the man page of git clone for more details on the implications.
+
+As this is mainly the same data as the tarball, the download in this mode is the fastest of all options.
+
+If you want to play around with the different server versions, you need to download these and unshallow the repository using `git fetch --unshallow`.
+This will take quite some time and will download the complete server history.
+
+## Clone with complete history
+
+If you know that you will need the complete history of the server repository, you might want to avoid first creating a shallow copy and then unshallow it directly.
+To cope with this, you can append `--full-clone` to the `./bootstrap.sh` command line:
+
+```
+./bootstrap.sh --full-clone
+```
+
+The benefit is that the complete repository is present and you can browse the history as you like.
+The obvious drawback is that you have to download the complete history which might take a significant amount of time.
+
+## Clone with the blobs filtered out
+
+There is also one more option to the script, namely `--clone-no-blobs`.
+This works only with a sufficiently recent version of git.
+Instead of a shallow clone (where the history is truncated), a partial clone created by this parameter has the complete history attached.
+In that sense, you can navigate the complete history as you like.
+You would do the following to create such a partial clone:
+```
+./bootstrap.sh --clone-no-blobs
+```
+
+The main difference to a shallow clone is that the cloned repository will not download all files (git calls them _blobs_) stored in the past.
+Instead, once you checkout a certain commit, git checks for all files if the corresponding file has been downloaded in the past.
+If it was, it uses this copy.
+If the file was not yet downloaded, a new connection to the upstream repository has to be made and the missing blobs are downloaded.
+Just after the clone of such a partially cloned repo, git will download all blobs needed to view the (current) branch content.
+This is very similar to the shallow clone where only the content of the last commit is downloaded.
+
+As the complete history is generally known, you can use the normal git commands to handle such a repository.
+You can just pull/fetch as you are used.
+Switching a branch might download the required files on the fly.
+Any later update (using `git fetch` or `git pull`) will respect the setting and also download no blobs directly.
+
+!!! Info
+    This will clone the repository with `--filter blob:none`.
+    Again see the man page of `git clone` for more details.
+
+The benefit of this approach is obviously that you can have a complete history that you can work with (as long as you do not need the file contents).
+The initial clone takes a bit longer than the shallow one as additionally the history commits (without the contents) need to be transmitted.
+
+The obvious drawback is that once you need to checkout a file that was never checked out in the clone, it has to be downloaded and a live internet connection is needed.

docs/basics/overview.md

@@ -2,7 +2,7 @@
 
 ## 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.
+There are multiple containers that can be started for Nextcloud. The main `nextcloud` container is targeting 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.
 
@@ -32,16 +32,17 @@ The Nextcloud containers are configured to use multiple app directories.
 
 The cronjobs are configured to run every 5 minutes in the individual containers.
 
-For testing you can also run them manually:
+For testing, you can also run them manually:
 
 ```bash
-docker-compose exec nextcloud php cron.php
+docker compose exec nextcloud php cron.php
 ```
 
 ### occ
 
-Run inside of the Nextcloud container:
+Run inside the Nextcloud container:
 
 ```
 set XDEBUG_CONFIG=idekey=PHPSTORM
 sudo -E -u www-data php -dxdebug.remote_host=192.168.21.1 occ
+```

docs/basics/ssl.md

@@ -10,7 +10,7 @@ mkcert is a simple tool for making locally-trusted development certificates. It
 * 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`
+* `docker compose restart proxy`
 * There is also a script to generate/update all certs: `./scripts/update-certs`
 
 ## Use self-signed certificates

docs/basics/stable-versions.md

@@ -1,14 +1,16 @@
 # 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.
+As described in the [overview](overview.md) there are multiple Nextcloud containers available. The main `nextcloud` container is targeting 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:
+Assuming 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
+# make sure the stable version is fetched
+git fetch origin stable28:stable28
 # create a new worktree for the stable28 branch
 cd ~/nextcloud-docker-dev/workspace/server
 git worktree add ../stable28 stable28
@@ -29,9 +31,36 @@ git worktree add ../../../stable28/apps/viewer stable28
 ## Start the stable28 container
 
 ```bash
-docker-compose up -d stable28
+docker compose up -d stable28
 ```
+You can now access the stable Nextcloud instance at [http://stable28.local](http://stable28.local).
 
 ## 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`
+Some apps do not have stable branches or cover multiple Nextcloud version. 
+You can clone the apps you need in the stable versions to the path set in `ADDITIONAL_APPS_PATH`.
+By default, this path set to `./data/apps-extra` and then mounted to `/var/www/html/apps-shared` in `docker-compose.yml`:
+
+```
+'${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
+```
+
+You can change the default value in the `.env` file:
+
+```
+ADDITIONAL_APPS_PATH=/path-to-your-app/
+```
+
+#### 🤓 How to check if the ADDITIONAL_APPS_PATH mounting worked as expected
+1. Check if your app is listed at [http://stable28.local/index.php/settings/apps/disabled](http://stable28.local/index.php/settings/apps/disabled)
+2. Alternatively, login into the container created from the image `nextcloud-dev-php<PHP version>` and run `occ app:list`:
+```bash
+  docker exec -it <container name or ID> /bin/bash
+  occ app:list
+```
+Your app should be listed under the `Disabled` list.
+
+- https://docs.docker.com/engine/reference/commandline/container_exec/
+- https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#apps-commands-label
+
+

docs/basics/standalone.md

@@ -9,7 +9,7 @@ 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
+docker run --rm -p 8080:80 ghcr.io/juliusknorr/nextcloud-dev-php80:latest
 ```
 
 For app development you can mount your app directly into the container:
@@ -17,17 +17,17 @@ 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
+    ghcr.io/juliusknorr/nextcloud-dev-php81:latest
 ```
 
-The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specificing either a server branch or git tag.
+The `SERVER_BRANCH` environment variable can be used to run different versions of Nextcloud by specifying 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
+docker run --rm -p 8080:80 -e SERVER_BRANCH=v32.0.1 ghcr.io/juliusknorr/nextcloud-dev-php81: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
+docker run --rm -p 8080:80 -e SERVER_BRANCH=v32.0.1 -v /tmp/server:/var/www/html ghcr.io/juliusknorr/nextcloud-dev-php81:latest
 ```

docs/basics/troubleshooting.md

@@ -1,13 +1,13 @@
 # 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.
+- 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.
+- 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
+- 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

docs/basics/update.md

@@ -3,20 +3,33 @@
 ## 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.
+- Update the container images through either
+  - `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 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
+As Nextcloud containers are bound to a server major version and the code is updated through manual git pull.
+
+It is recommended to stay up to date with the latest development version of the Nextcloud server:
 
 ```bash
-docker-compose exec nextcloud occ upgrade
+cd workspace/server
+git pull
+git submodule update
+```
+
+For other apps checked out you might want to run a separate `git pull` in the respective directories.
+
+If nextcloud requires migration steps it will ask you to run an upgrade which can be done with the following command:
+
+```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.
+You might want to take the opportunity to then set up the previous version as a new stable version setup. See [stable versions](stable-versions.md) for more information.

docs/customizing/build.md

@@ -10,4 +10,4 @@ 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.
+Afterward you can recreate 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.

docs/customizing/nginx.md

@@ -0,0 +1,19 @@
+# Customize nginx config
+
+## Add custom config for a virtualhost config
+
+Add a config snippet to `data/nginx/vhost.d/<vhost-name>`, it will be included in the respective vhost config automatically.
+
+For example to redirect all requests to `/apps.*/text` to a `vite serve` process on the docker host, add the following to `data/nginx/vhost.d/nextcloud.local`:
+
+```
+location ~* ^/apps.*/text/ {
+    rewrite ^/apps.*/text/(.*) /$1 break;
+    proxy_pass http://host.docker.internal:5173;
+    # fallback to nextcloud server if vite serve doesn't answer
+    error_page 502 = @fallback;
+}
+location @fallback {
+    proxy_pass http://nextcloud.local;
+}
+```

docs/customizing/tips.md

@@ -6,10 +6,10 @@ It can be useful to be able to access your setup quickly through your shell. Her
 
 ## 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`.
+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 $@)
+ (cd ~/path/to/nextcloud-docker-dev && docker compose $@)
 }
 ```

docs/index.md

@@ -1,4 +1,4 @@
-This documentation covers a Nextcloud development environment using docker-compose providing a large variety of services for Nextcloud server and app development and testing.
+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** 
 
@@ -14,4 +14,4 @@ Various settings in this setup are considered insecure and default passwords and
 - 🚀 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.
+Follow the [getting started guide](https://juliusknorr.github.io/nextcloud-docker-dev/basics/getting-started/) or the [Nextcloud developer tutorial](https://nextcloud.com/developer/) to get started.

docs/services/app_api.md

@@ -0,0 +1,87 @@
+# AppAPI
+
+For [AppAPI](https://github.com/nextcloud/app_api) the [Docker Socket Proxy](https://github.com/nextcloud/docker-socket-proxy) (DSP) is required to work.
+
+## HTTP AppAPI DSP
+
+### 1. Start the HTTP DSP container
+
+```bash
+docker compose up -d appapi-dsp
+```
+
+### 2. Configure Deploy daemon
+
+After the DSP container is running, configure the Deploy daemon in AppAPI admin settings with the following parameters:
+
+- **Host**: `http://nextcloud-appapi-dsp-http:2375`
+- **Nextcloud URL**: `http://nextcloud.local` (locally always use http)
+- **Enable https**: `false`
+- **Network**: `master_default` (the network of nextcloud-docker-dev docker-compose, by default it is `master_default`)
+- **HaProxy password**: `some_secure_password`
+
+or via OCC CLI:
+
+```bash
+./scripts/occ.sh nextcloud -- app_api:daemon:register dsp_http "DSP HTTP" docker-install http "nextcloud-appapi-dsp-http" "http://nextcloud.local" --net=master_default --set-default
+```
+
+## HTTPS AppAPI DSP
+
+For HTTPS DSP setup, please refer to the [HTTPS (remote)](https://github.com/nextcloud/docker-socket-proxy?tab=readme-ov-file#httpsremote) section.
+
+### 1. Generate self-signed certificates
+
+Following the instruction from the DSP repository, generate and place the self-signed certificate in the `nextcloud-docker-dev/data/ssl/app_api/app_api.pem` directory.
+
+> **Note**: Additionally, you can copy the `app_api.pem` file to the `nextcloud-docker-dev/data/shared` directory 
+> to be able to access it for import in each nextcloud dev container (e.g. `occ security:certificates:import /shared/app_api.pem`).
+
+### 2. Start the HTTPS DSP container
+
+```bash
+docker compose up -d appapi-dsp-https
+```
+
+### 3. Configure Deploy daemon
+
+After the DSP container is running and the certificate is imported in Nextcloud, configure the Deploy daemon in AppAPI admin settings with the following parameters:
+
+- **Host**: `https://<nextcloud-appapi-dsp-https or BIND_ADDRESS IP>:2375` (use host depending on your setup)
+- **Nextcloud URL**: `http://nextcloud.local` (locally always use http)
+- **Enable https**: `true`
+- **Network**: `host` (with https enabled, the network is forced to `host`)
+- **HaProxy password**: `some_secure_password`
+
+or via OCC CLI:
+
+```bash
+./scripts/occ.sh nextcloud -- app_api:daemon:register dsp_https "DSP HTTPS" docker-install https "nextcloud-appapi-dsp-https" "http://nextcloud.local" --net=host --set-default
+```
+
+
+## Environment variables
+
+The list of available environment variables for the AppAPI DSP is listed in its repository,
+and in the `example.env` file.
+
+## Troubleshooting
+
+### Image of AppAPI DSP is not accessible
+
+In case the AppAPI DSP image is not accessible, you can build it locally by cloning the [Docker Socket Proxy](https://github.com/nextcloud/docker-socket-proxy) repository and running the following commands:
+
+```bash
+git clone https://github.com/nextcloud/docker-socket-proxy.git
+```
+
+```bash
+cd docker-socket-proxy 
+```
+
+```bash
+ docker build -f ./Dockerfile -t nextcloud-appapi-dsp:latest ./
+```
+
+After that change the image name in the `docker-compose.yml` file
+for `appapi-dsp` or `appapi-dsp-https` service to `nextcloud-appapi-dsp:latest` and try again.

docs/services/clamav.md

@@ -1,7 +1,7 @@
 # Antivirus
 
 ```bash
-docker-compose up -d proxy nextcloud av
+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

docs/services/database.md

@@ -2,17 +2,18 @@
 
 ## 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:
+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`
+- `oci`
 
-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`.
+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:
+All databases use the following credentials by default (except oracle):
 
 - Root password: `nextcloud`
 - Username: `nextcloud`
@@ -26,24 +27,24 @@ All databases use the following credentials by default:
 You can access the database with the following command:
 
 ```bash
-docker-compose exec mariadb mysql -u root -pnextcloud
+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>.
+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.
+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
+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>.
+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.
+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-pgsql 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`
@@ -53,7 +54,7 @@ That's it, open the following path to see the Nextcloud tables: `Server group 1
 You can access the database with the following command:
 
 ```bash
-docker-compose exec nextcloud sqlite3 /var/www/html/data/nextcloud.db
+docker compose exec nextcloud sqlite3 /var/www/html/data/nextcloud.db
 ```
 
 ### MariaDB Replica
@@ -63,12 +64,20 @@ This mode runs a mariadb primary and read replica setup. The primary is used for
 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
+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`.
+The logs of MaxScale can be accessed with `docker compose exec maxscale cat /var/log/maxscale/maxscale.log`.
+
+### Oracle
+
+You can access the database with the following command:
+
+```bash
+docker compose exec -ti database-oci sqlplus system/oracle
+```

docs/services/imaginary.md

@@ -3,6 +3,6 @@
 Enable the imaginary server for generating previews
 
 ```bash
-docker-compose up proxy nextcloud previews_hpb
+docker compose up proxy nextcloud previews_hpb
 ./scripts/enable-preview-imaginary.sh
 ```

docs/services/ldap.md

@@ -1,6 +1,6 @@
 # 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.
+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/juliusknorr/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.
 
@@ -8,4 +8,4 @@ Example users are: `leela fry bender zoidberg hermes professor`. The password is
 
 - 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*))"`
+  - `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*))"`

docs/services/more.md

@@ -1,7 +1,7 @@
 ## Global scale
 
 ```
-docker-compose up -d proxy portal gs1 gs2 lookup database-mysql
+docker compose up -d proxy portal gs1 gs2 lookup database-mysql
 ```
 
 Users are named the same as the instance name, e.g. `gs1`, `gs2`
@@ -9,7 +9,7 @@ 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
+docker compose up -d elasticsearch elasticsearch-ui
 ```
 
 - Address for configuring in Nextcloud: `http://elastic:elastic@elasticsearch:9200`

docs/services/notify_push.md

@@ -0,0 +1,28 @@
+# Notify Push service
+
+Prepare your setup:
+* Setup your server with https.
+* Install `notify_push` app.
+* Start `push` alongside the other services:
+  ```
+  docker compose up nextcloud proxy push
+  ```
+
+Configure `notify_push` on the nextcloud instance:
+* Configure the `notify_push` url:
+  ```
+  ./occ notify_push:setup http://push:7867/push
+  ```
+Once `notify_push:setup` finishes you can test the setup:
+```bash
+./occ notify_push:self-test
+```
+
+## Fixing problems:
+
+If the version does not match:
+  * Alter `docker/push/Dockerfile`.
+  * Rebuild the image (`docker build .`).
+  * Replace the push image in `docker-compose.yml`.
+  * Tear down and restart the push service.
+

docs/services/office.md

@@ -16,7 +16,7 @@ It requires to have the [richdocuments](https://github.com/nextcloud/richdocumen
 
 - 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`
+- 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
 

docs/services/onlyoffice.md

@@ -4,6 +4,14 @@ ONLYOFFICE is a self-hosted office suite that can be used with Nextcloud.
 
 ## Automatic setup
 
+Make sure to clone <https://github.com/ONLYOFFICE/onlyoffice-nextcloud> into your apps directory:
+
+```bash
+cd ~/nextcloud-docker-dev/workspace/server/apps-extra
+git clone https://github.com/ONLYOFFICE/onlyoffice-nextcloud onlyoffice
+```
+
+
 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.
@@ -15,6 +23,6 @@ It requires to have the onlyoffice integration app cloned into your apps directo
 ## 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`
+- 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

docs/services/s3.md

@@ -1,9 +1,102 @@
 # S3 / Object storage
 
-## Primary object storage
+S3-compatible object storage can be easily tested with the included containers. Two options are available:
+
+- **rustfs** (recommended) - A fast, lightweight S3-compatible object storage server written in Rust
+- **minio** - Abandoned S3-compatible object storage server (open-source version moved to maintenance-only mode with stripped-down UI)
+
+## rustfs (Recommended)
+
+rustfs is the preferred option for development and testing due to its performance and simplicity.
+
+### Starting rustfs
+
+Start the container using the following command:
+
+```bash
+docker compose up -d rustfs
+```
+
+### Primary object storage
+
+Primary object storage can be enabled by setting the `PRIMARY=rustfs` environment variable either in your `.env` file or in `docker-compose.yml` for individual containers.
+
+```bash
+PRIMARY=rustfs docker compose up nextcloud rustfs
+```
+
+### External object storage
+
+External storage can be configured in the Nextcloud admin settings (configuration labels may depend on app version).
+This is an example configuration for the `nc-external` bucket, buckets will be automatically created so you can name any bucket you like:
+
+General:
+- External storage: `S3 Storage`
+- Authentication: `Static credentials` / `Access Key`
+Storage configuration:
+- Bucket: `nc-external`
+- Hostname: `rustfs`
+- Port: `9000`
+- Enable SSL: `No`
+- Enable Path Style: `Yes`
+- Use Legacy S3 signing (v2) / Legacy (v2) Authentication: `No`
+Authentication:
+- Access Key: `nextcloud`
+- Secret Key: `nextcloud`
+
+### Accessing rustfs console
+
+rustfs can be accessed via the browser at <http://rustfs.local> with the following credentials:
+
+- Username: `nextcloud`
+- Password: `nextcloud`
+
+## Minio (Alternative)
+
+Minio is a more feature-rich alternative with additional management capabilities. However, critics often point to recent controversial changes, including shifting to a maintenance-only mode for the open-source version and stripping down the UI. For these reasons, rustfs is now the recommended choice for most development workflows.
+
+### Starting Minio
+
+Start the container using the following command:
+
+```bash
+docker compose up -d minio
+```
+
+### 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
+PRIMARY=minio docker compose up nextcloud minio
 ```
+
+### External object storage
+
+External storage can be configured in the Nextcloud admin settings. This is an example configuration for the `nc-external` bucket, buckets will be autocreated so you can name any bucket you like:
+
+- Bucket: `nc-external`
+- Authentication: `Access Key`
+- Hostname: `minio`
+- Port: `9000`
+- Enable SSL: `No`
+- Enable Path Style: `Yes`
+- Legacy (v2) Authentication: `No`
+- Access Key: `nextcloud`
+- Secret Key: `nextcloud`
+
+### Accessing Minio
+
+Minio can be accessed via the browser at <http://minio.local> with the following credentials:
+
+- Username: `nextcloud`
+- Password: `nextcloud`
+
+### Using mc command line
+
+This can be useful for admin operations like setting a bucket quota on the `nc-external` bucket name:
+
+```
+docker compose exec minio mc alias set minio http://localhost:9000 nextcloud nextcloud
+docker compose exec minio mc quota set minio/nc-external --size 1k
+````

docs/services/sso.md

@@ -4,21 +4,30 @@
 ## [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>
+- If you have ssl enabled please modify the example realm config accordingly in `docker/configs/keycloak/Example-realm.json`
+- `occ user_oidc:provider Keycloak -c nextcloud -s 09e3c268-d8bc-42f1-b7c6-74d307ef5fde -d http://keycloak.local/auth/realms/Example/.well-known/openid-configuration`
+- <http://keycloak.local/auth/realms/Example/.well-known/openid-configuration>
 - nextcloud
 - 09e3c268-d8bc-42f1-b7c6-74d307ef5fde
 
+## Authentik
+
+```
+docker compose up -d proxy nextcloud authentik
+```
+
+The server will be available on [http://authentik.local:9000](http://authentik.local:9000) and you can follow [authentik documentation](https://integrations.goauthentik.io/chat-communication-collaboration/nextcloud/) to understand how to configure Nextcloud with SAML (but also OIDC and LDAP).
+
 ## SAML
 
 ```
-docker-compose up -d proxy nextcloud 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`
+- idp entity id: `https://sso.local/simplesaml/saml2/idp/metadata.php`
+- Single Sign-On (SSO) service url: `https://sso.local/simplesaml/saml2/idp/SSOService.php`
+- single log out service url: `https://sso.local/simplesaml/saml2/idp/SingleLogoutService.php`
 - use certificate from `docker/configs/var-simplesamlphp/cert/example.org.crt`
 
   ```

docs/services/talk.md

@@ -1,8 +1,17 @@
-# Talk HPB
+# 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`
+  - 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`)
+
+## Recording
+
+- Make sure to have the recording hostname setup in your `/etc/hosts` file: `127.0.0.1 talk-recording.local`
+- Make sure the Talk HPB is running and configured
+- Start the talk recording server in addition to your other containers `docker-compose up -d talk-recording`
+- Go to the admin settings of talk and add the recording server (`http://talk-recording.local` with shared secret `6789`)

docs/tools/blackfire.md

@@ -1,8 +1,8 @@
 # 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`.
+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:
+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
@@ -13,6 +13,6 @@ After that you can use Blackfire through the browser plugin or curl as described
 ### Using with curl
 
 ```
-alias blackfire='docker-compose exec -e BLACKFIRE_CLIENT_ID=$BLACKFIRE_CLIENT_ID -e BLACKFIRE_CLIENT_TOKEN=$BLACKFIRE_CLIENT_TOKEN blackfire blackfire'
+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/
 ```

docs/tools/xdebug.md

@@ -8,7 +8,7 @@ Xdebug is shipped but disabled by default. It can be turned on by running:
 
 You can also enable other modes, e.g. trace:
 
-````
+```
 ./scripts/php-mod-config nextcloud xdebug.mode debug,trace
 ```
 

example.env

@@ -24,6 +24,9 @@ PROTOCOL=http
 # BLACKFIRE_SERVER_ID=
 # BLACKFIRE_SERVER_TOKEN=
 
+# By default the published ports are only accessible at 127.0.0.1 (your localhost).
+# Set this to '0.0.0.0' to make them accessible from your whole local network.
+# IP_BIND=127.0.0.1
 
 # can be used to run separate setups besides each other
 # DOCKER_SUBNET=192.168.15.0/24
@@ -44,8 +47,26 @@ DOMAIN_SUFFIX=.local
 # PHP_VERSION=81
 
 # May be used to choose database (sqlite, pgsql, mysql)
-# SQL=pgsql
+SQL=mysql
 
 # 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
+
+# Docker socket location, use it when you run rootless Docker
+# Replace "1000" with the uid used by your Docker engine (default $(id -u))
+# DOCKER_SOCKET=/run/user/1000/docker.sock
+
+# Nextcloud AppAPI Docker Socket Proxy
+# ------------------------------------
+# NC_HAPROXY_PASSWORD=some_secure_password
+# BIND_ADDRESS=172.17.0.1
+# CERT_PATH=./data/ssl/app_api/app_api.pem
+# NETWORK_MODE=host
+# HAPROXY_PORT=2375
+# TIMEOUT_CONNECT=10s
+# TIMEOUT_CLIENT=30s
+# TIMEOUT_SERVER=30s
+# EX_APPS_NET=ipv4@localhost
+# EX_APPS_COUNT=50
+# ------------------------------------

scripts/enable-collabora

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 if [ -z "$1" ]
   then
     echo "Usage $0 CONTAINER"
@@ -9,15 +16,14 @@ fi
 CONTAINER=$1
 
 function occ() {
-    docker compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
+    docker_compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
 }
 
-# shellcheck disable=SC1091
-source .env
+
 
 echo "Setting up Collabora with collabora$DOMAIN_SUFFIX on $CONTAINER"
-docker-compose up -d collabora
-occ app:enable richdocuments
+docker_compose up -d collabora
+occ app:enable richdocuments --force
 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"

scripts/enable-onlyoffice

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 if [ -z "$1" ]
 then
   CONTAINER=nextcloud
@@ -8,20 +15,19 @@ else
 fi
 
 function occ() {
-    docker compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
+    docker_compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
 }
 
-# shellcheck disable=SC1091
-source .env
-
 echo "Setting up ONLYOFFICE with onlyoffice$DOMAIN_SUFFIX on $CONTAINER"
-docker-compose up -d onlyoffice
+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 config:app:set onlyoffice StorageUrl --value="http://${CONTAINER}${DOMAIN_SUFFIX}/"
 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'
+docker_compose exec onlyoffice /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string'
+
+docker_compose exec onlyoffice supervisorctl start ds:example

scripts/enable-preview-imaginary.sh

@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
+
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 function OCC () {
-    docker compose exec nextcloud sudo -E -u www-data "./occ" "$@"
+    docker_compose exec nextcloud sudo -E -u www-data "./occ" "$@"
 }
 
 OCC config:system:set enabledPreviewProviders 0 --value 'OC\Preview\MP3'

scripts/enable-talk-hpb.sh

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 if [ -z "$1" ]
   then
     echo "Usage $0 CONTAINER"
@@ -9,16 +16,13 @@ fi
 CONTAINER=$1
 
 function occ() {
-    docker compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
+    docker_compose exec "$CONTAINER" sudo -E -u www-data "./occ" "$@"
 }
 
-# shellcheck disable=SC1091
-source .env
+echo "Setting up talk signaling with ${PROTOCOL:-http}://talk-signaling$DOMAIN_SUFFIX on $CONTAINER"
+docker_compose up -d talk-signaling talk-janus
 
-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"
+if ! occ talk:signaling:list --output="plain" | grep -q "${PROTOCOL:-http}://talk-signaling$DOMAIN_SUFFIX"; then
+  occ talk:signaling:add "${PROTOCOL:-http}://talk-signaling$DOMAIN_SUFFIX" "1234"
 fi
 

scripts/functions.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+function get_docker_compose_command() {
+    docker-compose version >/dev/null 2>/dev/null && DCC='docker-compose'
+    docker compose version >/dev/null 2>/dev/null && DCC='docker compose'
+    if [ -z "$DCC" ]; then
+        return
+    fi
+    echo "$DCC"
+}
+
+function docker_compose() {
+    DCC=$(get_docker_compose_command)
+    if [ -z "$DCC" ]; then
+        echo "❌ Install docker-compose before running this script"
+        exit 1
+    fi
+    $DCC "$@"
+}

scripts/mysql.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 # Default container name to operate on
 instance=${INSTANCE:-nextcloud}
 
@@ -19,7 +26,7 @@ EOF
 }
 
 run_mysql() {
-    docker compose exec database-mysql mysql -u nextcloud -pnextcloud "$instance" "$@"
+    docker_compose exec database-mysql mysql -u nextcloud -pnextcloud "$instance" "$@"
     exit $?
 }
 

scripts/occ.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 # Default container name to operate on
 container=${CONTAINER:-nextcloud}
 # container_set=
@@ -35,7 +42,7 @@ EOF
 }
 
 run_occ() {
-    docker compose exec --user www-data "$container" ./occ "$@"
+    docker_compose exec --user www-data "$container" ./occ "$@"
     exit $?
 }
 

scripts/php-mod-config

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 if [ -z "$1" ]
   then
     echo "Usage $0 CONTAINER blackfire on|off"
@@ -10,17 +17,12 @@ fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 restart() {
-    (cd "$SCRIPT_DIR/.." && docker compose exec "$1" pkill -USR1 apache2)
+    (cd "$SCRIPT_DIR/.." && docker_compose exec "$1" pkill -USR1 apache2)
 }
 
 docker_exec() {
     # shellcheck disable=SC2068
-    (cd "$SCRIPT_DIR/.." && docker compose exec $@)
-}
-
-docker_compose() {
-    # shellcheck disable=SC2068
-    (cd "$SCRIPT_DIR/.." && docker compose $@)
+    (cd "$SCRIPT_DIR/.." && docker_compose exec $@)
 }
 
 if [[ "$2" == "blackfire" ]]

scripts/update-certs

@@ -1,17 +1,19 @@
 #!/bin/bash
 
+set -e
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+# shellcheck source=example.env
+source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
+
 if ! [ -x "$(command -v mkcert)" ]; then
   echo 'Error: mkcert is not installed.' >&2
   exit 1
 fi
 
-
-SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 CERT_DIR="${SCRIPT_DIR}/../data/ssl/"
 
-# shellcheck disable=SC1091
-source "${SCRIPT_DIR}/../.env"
-
 awk '$1 == "-"{ if (key == "aliases:") print $NF; next } {key=$1}' docker-compose.yml | \
 	sed "s/\${DOMAIN_SUFFIX}/${DOMAIN_SUFFIX}/" | \
 	while read -r line;

scripts/update-hosts

@@ -1,9 +1,11 @@
 #!/bin/bash
 
+set -e
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
-
-# shellcheck disable=SC1091
+# shellcheck source=example.env
 source "${SCRIPT_DIR}/../.env"
+# shellcheck source=scripts/functions.sh
+source "${SCRIPT_DIR}/functions.sh"
 
 function addhost() {
 	ETC_HOSTS=/etc/hosts

tests/login.spec.ts

@@ -7,13 +7,13 @@ test.beforeEach(async ({ page }) => {
 
 test.describe('New Todo', () => {
   test('see the nextcloud login page', async ({ page }) => {
-    await expect(page).toHaveTitle('Login – Nextcloud');    
+    await expect(page).toHaveTitle('Login – Nextcloud');
   });
 
   test('login to nextcloud as admin', async ({ page }) => {
     await page.fill('#user', 'admin');
     await page.fill('#password', 'admin');
-    await page.getByRole('button', { name: 'Log in' }).click();
+    await page.getByRole('button', { name: 'Log in', exact: true }).click();
     await page.goto('http://nextcloud.local/index.php/apps/files');
   });
 });

tests/package-lock.json

@@ -9,32 +9,34 @@
       "version": "1.0.0",
       "license": "ISC",
       "devDependencies": {
-        "@playwright/test": "^1.40.1",
-        "@types/node": "^20.10.2"
+        "@playwright/test": "^1.52.0",
+        "@types/node": "^22.15.30"
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.40.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.40.1.tgz",
-      "integrity": "sha512-EaaawMTOeEItCRvfmkI9v6rBkF1svM8wjl/YPRrg2N2Wmp+4qJYkWtJsbew1szfKKDm6fPLy4YAanBhIlf9dWw==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz",
+      "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.40.1"
+        "playwright": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       }
     },
     "node_modules/@types/node": {
-      "version": "20.10.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.2.tgz",
-      "integrity": "sha512-37MXfxkb0vuIlRKHNxwCkb60PNBpR94u4efQuN4JgIAm66zfCDXGSAFCef9XUWFovX2R1ok6Z7MHhtdVXXkkIw==",
+      "version": "22.15.30",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz",
+      "integrity": "sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.21.0"
       }
     },
     "node_modules/fsevents": {
@@ -43,6 +45,7 @@
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -52,40 +55,43 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.40.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.40.1.tgz",
-      "integrity": "sha512-2eHI7IioIpQ0bS1Ovg/HszsN/XKNwEG1kbzSDDmADpclKc7CyqkHw7Mg2JCz/bbCxg25QUPcjksoMW7JcIFQmw==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz",
+      "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.40.1"
+        "playwright-core": "1.56.1"
       },
       "bin": {
         "playwright": "cli.js"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       },
       "optionalDependencies": {
         "fsevents": "2.3.2"
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.40.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.40.1.tgz",
-      "integrity": "sha512-+hkOycxPiV534c4HhpfX6yrlawqVUzITRKwHAmYfmsVreltEl6fAZJ3DPfLMOODw0H3s1Itd6MDCWmP1fl/QvQ==",
+      "version": "1.56.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz",
+      "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
     }
   }
 }

tests/package.json

@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@playwright/test": "^1.40.1",
-    "@types/node": "^20.10.2"
+    "@playwright/test": "^1.52.0",
+    "@types/node": "^22.15.30"
   }
 }