fix: deets

clarification of necessity of `command:` in case of custom entrypoint (and where to find it)

docs/federation/membership.md

@@ -18,6 +18,6 @@ title: Membership
 | [UTAW](https://utaw.tech) | -  | - | `@javielico:matrix.org` |
 | `@decentral1se` | Waiver | - | `@decentral1se` |
 | [ruangrupa](https://ruangrupa.id) | - | - | Henry `@babystepper:matrix.org` |
-| [Ammar](https://social.coop/@ammaratef45) | - | - | `@ammaratef45:matrix.org` |
+| [RTM](https://resisttechmonopolies.online) | ✅ | - | `@ammaratef45:matrix.org` + `@linnealovespie:matrix.org`|
 | [MIR](https://mirnet.org/) | ✅ | - | `@brooke:pub.solar` |
 | [Red Abya Yala](https://abyayala.sutty.nl/) | - | - | `@fauno:sutty.nl` |

docs/federation/resolutions/in-progress/031.md

@@ -0,0 +1,41 @@
+---
+title: "Resolution 031"
+---
+
+- Topic: Critical fixes amended process
+- Date: 2025-06-10
+- Deadline: 2025-06-24
+- Size: Medium
+
+### Summary
+
+This resolution proposes specific changes to [`R010: Budget 004: Critical
+fixes`](../passed/010.md). These changes are primarily intended to improve
+transparency and match our new organising methods.
+
+## Details
+
+Ammendments are as follows.
+
+1. "Confirmation from at least one other member": should be confirmed on the
+   issue itself and not in the Matrix chat. It is suggested to indicate this
+   when posting in the Matrix chat (aka "Please +1 on the issue itself").
+1. "A fix is deemed critical": when it is marked with the label "critical fix".
+   There is no specific project tracker for only these issues. This label can
+   be re-used across repositories also.
+
+### R010 in full
+
+> We propose to have a standing budget of 10 hrs / month available for fixes in Abra, Co-op Cloud recipes and other critical tools (e.g. recipes.coopcloud.tech) in the Co-op Cloud ecosystem.
+>
+> A fix is deemed critical when it is listed on this toolshed/organising board:
+>
+> > https://git.coopcloud.tech/toolshed/organising/projects/24
+>
+> This board is collectively gardened by Co-op Cloud participants (both federation members and not). The process for adding a ticket to the board requires getting confirmation from at least one other member of the federation.
+>
+> This budget can be claimed by any volunteer who would like to develop the fix. If the volunteer is not a Co-op Cloud federation member, they must first be "vouched for" by a federation member. This is an informal process which can be arranged via the Matrix chat. This aims to assure agreement on timing and what the fix should contain beforehand.
+>
+> Fixes can be claimed by assiging yourself to the ticket. If within 1 week there is no updates on the ticket, another volunteer can propose to take over. This process is also informal: please @ the original volunteer and give some reasonable time for them to reply (suggested: 1 day).
+>
+> If the fix is urgent and things need to move faster, please state so on the ticket. Please consult with at least one other member of the federation to confirm that there is indeed agreement on the urgency of the fix.

docs/federation/resolutions/in-progress/033.md

@@ -0,0 +1,33 @@
+---
+title: Resolution 033
+---
+
+- Topic: Changing OpenCollective fiscal host to Platform6
+- Date: 2025-07-16
+- Deadline: 2025-07-30
+- Size: Large
+
+## Summary
+
+Currently, the Open Collective "fiscal host" for Co-op Cloud is [Autonomic
+co-operative](https://autonomic.zone).
+
+This resolution proposes switching fiscal host to [Platform
+6](https://platform6.coop), by transferring our funds from Autonomic to
+Platform 6, and changing our registered fiscal host on Open Collective.
+
+This resolution will close Budget 001, because Platform 6 will take a fixed 5%
+of income, instead of being paid hourly.
+
+## Details
+
+Autonomic has been the fiscal host for Co-op Cloud since the first project
+funding was received.
+
+Since then, Autonomic has less capacity for finance administration work -- and
+Co-op Cloud is now managed by a democratic federation.
+
+So, to open up more capacity for project finance administration work, and to
+further decentralise Co-op Cloud organising from Autonomic, we're proposing
+Platform 6. Platform 6 have been fiscal host for co-operative projects
+including [meet.coop](https://meet.coop) and [wiki.cafe](https://wiki.cafe).

docs/federation/resolutions/passed/032.md

@@ -0,0 +1,22 @@
+---
+title: "Resolution 032"
+---
+
+- Topic: RTM joins Coopcloud
+- Date: 2025-06-30
+- Deadline: 2025-07-10
+- Size: Large
+
+### Summary
+
+Ammar's membership was approved in [Resolution 022](/federation/resolutions/passed/022).
+
+Since the establishment of RTM (Resist Rech Monopolies) collective in Seattle, Ammar has been unofficially representing the collective with coopcloud and vice versa.
+	
+### Details
+	
+RTM relies on the coop-cloud stack to host and manage their infrastructure, with the possibility of expanding this infrastructure to serve other communities and groups as the needs are identified and the capacity of the collective grows.
+
+In a loomio decision, the collective approved pursuing a membership with the federation and Ammar is both happy to vouch and to yield their membership to the group.
+
+This way this decision doesn't affect the total number of members.

docs/maintainers/catalogue.md

@@ -0,0 +1,95 @@
+---
+title: The Recipe Catalogue
+---
+
+## How are new recipes added to the catalogue?
+
+> This is so far a manual process which requires someone who's been added to the
+> `coop-cloud` "Organisation" on https://git.coopcloud.tech. 
+>
+> This is a temporary  situation, we want to open out this process & also introduce some automation 
+> to support making thie process more convenient. Please nag us to move things along on Matrix.
+
+- Publish your new recipe on the [git.coopcloud.tech](https://git.coopcloud.tech/coop-cloud) "Organisation"
+- Run `abra catalogue generate <recipe> -p`
+- Run `cd ~/.abra/catalogue && make`
+
+These minimal steps will publish a new recipe with no versions. You can also do
+the [recipe release publishing dance](https://docs.coopcloud.tech/maintainers/handbook/#how-do-i-release-a-new-recipe-version)
+which will then extend the `versions: [...]` section of the published JSON in the catalogue.
+
+Recipes that are not included in the catalogue can still be deployed. It is not
+required to add your recipes to the catalogue, but this will improve the
+visibility for other co-op hosters & end-users.
+
+For now, it is best to [get in touch](https://docs.coopcloud.tech/intro/contact/) if you want to add your recipe to the catalogue.
+
+In the future, we'd like to support [multiple catalogues](https://git.coopcloud.tech/toolshed/organising/issues/139).
+
+## How do I make the catalogue automatically regenerate after new recipe versions are published? 
+
+"I'd like to make it so that whenever I push a new git tag to the
+[`coop-cloud/rallly` repository](https://git.coopcloud.tech/coop-cloud/rallly)
+(probably [using `abra recipe
+release`](#how-do-i-release-a-new-recipe-version)), it automatically does the
+[recipe catalogue generation steps](#how-do-i-generate-the-recipe-catalogue)"
+
+1. Check whether tag builds are already trying to run: go to
+   https://build.coopcloud.tech, search for the recipe name (in this case taking
+   you to https://build.coopcloud.tech/coop-cloud/rallly/settings). If there are
+   failing builds, or if you see builds succeeding but catalogue regeneration
+   doesn't seem to be happening, then either dive in and try and fix it, or ask
+   for help in [`#coopcloud-tech`](https://matrix.to/#/#coopcloud-tech:autonomic.zone)
+2. Otherwise, click "activate repository". You probably want to set the "disable pull
+   requests" and "disable forks" options; they won't work anyway, but the
+   failures might be confusing.
+3. Make sure there is a `generate recipe catalogue` step in the recipe's
+   `.drone.yml` -- if there isn't, you can copy [the one from
+   `coop-cloud/rallly`](https://git.coopcloud.tech/coop-cloud/rallly/src/branch/main/.drone.yml#L24-L38) unchanged.
+4. That's it! Now, when you push a new tag, the recipe catalogue will regenerate
+   automatically. You can test this by re-pushing a tag (e.g. `git push origin
+   :0.5.0+3.5.1 && git push 0.5.0+3.5.1`)
+
+## How does automatic catalogue regeneration work?
+
+**TODO: write up properly**
+
+Context: the catalogue lives in a git repo here: https://git.coopcloud.tech/toolshed/recipes-catalogue-json
+
+The expectation is that this repo will only be updated automatically. While manual commits are possible, they're likely to be overwritten.
+
+Automatic regeneration is handled by this Drone step, in the separate `auto-recipes-catalogue-json` repo: https://git.coopcloud.tech/toolshed/auto-recipes-catalogue-json/src/branch/main/.drone.yml#L5-L25
+
+This is run on a daily schedule (question: where is `nightly-app-date` configured?), and can also be triggered by recipe repositories to make new versions available quicker – see "[How do I make the catalogue automatically regenerate after new versions are published?](#how-do-i-make-the-catalogue-automatically-regenerate-after-new-versions-are-published)" above.
+
+## How do I manually generate the recipe catalogue
+
+> These days, doing this is only useful in the event of troubleshooting the automatic catalogue regeneration
+
+To generate an entire new copy of the catalogue:
+
+```
+abra catalogue generate
+```
+
+You will most likely want to pass `--user/--username` / `--pass/--password` with container regsitry credentials to avoid rate limiting.
+
+If you just want to generate a catalogue entry for a single recipe:
+
+```
+abra catalogue generate <recipe>
+```
+
+The changes are generated and added to `~/.abra/catalogue`, you can validate what is done by running:
+
+```
+cd ~/.abra/catalogue
+git diff
+```
+
+You can pass `--publish` to have `abra` automatically publish those changes.
+
+!!! warning "Here be more SSH dragons"
+
+    In order to have `abra` publish changes for you automatically, you'll have to have write permissons to the git.coopcloud.tech repository and your account must have a working SSH key configuration. `abra` will use the SSH based URL connection details for Git by automagically creating an `origin-ssh` remote in the repository and pushing to it.
+

docs/maintainers/handbook.md

@@ -402,70 +402,24 @@ You can also add release notes for the next release into a special file `release
 
     This feature is only available in the > 0.9.x series of `abra`.
 
-## How do I generate the recipe catalogue
+## How do I know whether to accept version upgrades when running `abra recipe upgrade <something>`?
 
-To generate an entire new copy of the catalogue:
+### Postgres
 
-```
-abra catalogue generate
-```
+Beware major Postgres version updates!
 
-You will most likely want to pass `--user/--username` / `--pass/--password` with container regsitry credentials to avoid rate limiting.
+"Major" updates are ones where the first number changes, for example 14 to 15 (or 14.1 to 15.1).
 
-If you just want to generate a catalogue entry for a single recipe:
+Postgres cannot update itself, so accepting major version upgrades can break existing app deployments.
 
-```
-abra catalogue generate <recipe>
-```
+To check if a recipe can handle upgrades:
 
-The changes are generated and added to `~/.abra/catalogue`, you can validate what is done by running:
+1. Check whether the recipe is using the `pgautoupgrade` image.
+2. Check whether the recipe contains a custom postgres entrypoint, `entrypoint.postgres.sh`.
 
-```
-cd ~/.abra/catalogue
-git diff
-```
+If neither #1 nor #2 is true, **do not include a "major" postgres upgrade in a recipe upgrade**.
 
-You can pass `--publish` to have `abra` automatically publish those changes.
-
-!!! warning "Here be more SSH dragons"
-
-    In order to have `abra` publish changes for you automatically, you'll have to have write permissons to the git.coopcloud.tech repository and your account must have a working SSH key configuration. `abra` will use the SSH based URL connection details for Git by automagically creating an `origin-ssh` remote in the repository and pushing to it.
-
-## How do I make the catalogue automatically regenerate after new versions are published? 
-
-"I'd like to make it so that whenever I push a new git tag to the
-[`coop-cloud/rallly` repository](https://git.coopcloud.tech/coop-cloud/rallly)
-(probably [using `abra recipe
-release`](#how-do-i-release-a-new-recipe-version)), it automatically does the
-[recipe catalogue generation steps](#how-do-i-generate-the-recipe-catalogue)"
-
-1. Check whether tag builds are already trying to run: go to
-   https://build.coopcloud.tech, search for the recipe name (in this case taking
-   you to https://build.coopcloud.tech/coop-cloud/rallly/settings). If there are
-   failing builds, or if you see builds succeeding but catalogue regeneration
-   doesn't seem to be happening, then either dive in and try and fix it, or ask
-   for help in [`#coopcloud-tech`](https://matrix.to/#/#coopcloud-tech:autonomic.zone)
-2. Otherwise, click "activate repository". You probably want to set the "disable pull
-   requests" and "disable forks" options; they won't work anyway, but the
-   failures might be confusing.
-3. Make sure there is a `generate recipe catalogue` step in the recipe's
-   `.drone.yml` -- if there isn't, you can copy [the one from
-   `coop-cloud/rallly`](https://git.coopcloud.tech/coop-cloud/rallly/src/branch/main/.drone.yml#L24-L38) unchanged.
-4. That's it! Now, when you push a new tag, the recipe catalogue will regenerate
-   automatically. You can test this by re-pushing a tag (e.g. `git push origin
-   :0.5.0+3.5.1 && git push 0.5.0+3.5.1`)
-
-## How does automatic catalogue regeneration work?
-
-**TODO: write up properly**
-
-Context: the catalogue lives in a git repo here: https://git.coopcloud.tech/toolshed/recipes-catalogue-json
-
-The expectation is that this repo will only be updated automatically. While manual commits are possible, they're likely to be overwritten.
-
-Automatic regeneration is handled by this Drone step, in the separate `auto-recipes-catalogue-json` repo: https://git.coopcloud.tech/toolshed/auto-recipes-catalogue-json/src/branch/main/.drone.yml#L5-L25
-
-This is run on a daily schedule (question: where is `nightly-app-date` configured?), and can also be triggered by recipe repositories to make new versions available quicker – see "[How do I make the catalogue automatically regenerate after new versions are published?](#how-do-i-make-the-catalogue-automatically-regenerate-after-new-versions-are-published)" above.
+Feel welcome to ask for help in #coopcloud-tech:matrix.autonomic.zone
 
 ## How do I enable healthchecks
 
@@ -567,30 +521,6 @@ The possible Values are:
 
 The setting does only apply when you also set a length modifier to the secret (documented [here](/maintainers/handbook/#how-do-i-change-secret-generation-length)), so it is not applicable for the "easy to remember word" style generator that used when you don't set a length.
 
-## How are recipes added to the catalogue?
-
-> This is so far a manual process which requires someone who's been added to the
-> `coop-cloud` "Organisation" on https://git.coopcloud.tech. This is a temporary
-> situation, we want to open out this process & also introduce some automation
-> to support making thie process more convenient. Please nag us to move things
-> along.
-
-- Publish your new recipe on the [git.coopcloud.tech](https://git.coopcloud.tech/coop-cloud) "Organisation"
-- Run `abra catalogue generate <recipe> -p`
-- Run `cd ~/.abra/catalogue && make`
-
-These minimal steps will publish a new recipe with no versions. You can also do
-the [recipe release publishing dance](https://docs.coopcloud.tech/maintainers/handbook/#how-do-i-release-a-new-recipe-version)
-which will then extend the `versions: [...]` section of the published JSON in the catalogue.
-
-Recipes that are not included in the catalogue can still be deployed. It is not
-required to add your recipes to the catalogue, but this will improve the
-visibility for other co-op hosters & end-users.
-
-For now, it is best to [get in touch](https://docs.coopcloud.tech/intro/contact/) if you want to add your recipe to the catalogue.
-
-In the future, we'd like to support [multiple catalogues](https://git.coopcloud.tech/toolshed/organising/issues/139).
-
 ## How do I configure backup/restore?
 
 From the perspective of the recipe maintainer, backup/restore is just more
@@ -716,6 +646,11 @@ Please note:
 1. The `file_env` / `_FILE` hack is to pass secrets into the container runtime without exposing them in plaintext in the configuration. See [this entry](/maintainers/handbook/#exposing-secrets) for more.
 
 1. In order to pass execution back to the original entrypoint, it's a good idea to find the original entrypoint script and run it from your own entrypoint script. If there is none, you may want to reference the `CMD` definition or if that isn't working, try to actually specify `cmd: ...` in the `compose.yml` definition (there are other recipes which do this).
+  
+1. Also it might be necessary to define command: although there is an original entrypoint. That's [due to the fact](https://docs.docker.com/reference/compose-file/services/#entrypoint) that if entrypoint is non-null, Compose ignores any default command from the image, for example the `CMD` instruction in the Dockerfile.
+
+  1. Pratically you would e.g. look for the Dockerfile of the upstream image. In there you should find the docker-entrypoint.sh (or similar) and where it's located. Furthermore you find the `CMD`-line there. 
+  1. Just put in your entrypoint.sh in the last line: exec /path/to/docker-entrypoint.sh "@" (path and filename you should find in upstream Dockerfile) and insert  command:  to your service in compose.yml with the value of what you find in the CMD line of the Dockerfile.
 
 1. If you're feeling reckless, you can also use the Golang templating engine to do things conditionally.
 

mkdocs.yml

@@ -75,6 +75,7 @@ nav:
       - maintainers/index.md
       - "New Maintainers Tutorial": maintainers/tutorial.md
       - "Packaging Handbook": maintainers/handbook.md
+      - maintainers/catalogue.md
   - "Operators":
       - operators/index.md
       - "New operators Tutorial": operators/tutorial.md
@@ -121,11 +122,14 @@ nav:
               - federation/resolutions/passed/027.md
               - federation/resolutions/passed/028.md
               - federation/resolutions/passed/029.md
+              - federation/resolutions/passed/032.md
           - "Stalled":
               - federation/resolutions/stalled/013.md
           - "In Progress":
               - federation/resolutions/index.md
               - federation/resolutions/in-progress/030-docs-naming-survey.md
+              - federation/resolutions/in-progress/031.md
+              - federation/resolutions/in-progress/033.md
       - "Minutes":
           - federation/minutes/index.md
           - "Recently":