ABRA_SERVER → TEST_SERVER

See toolshed/abra#585

docs/abra/hack.md

@@ -91,6 +91,26 @@ Please ask `@decentral1se` or on the Matrix channels for SSH access to the machi
 
 We use [`bats`](https://bats-core.readthedocs.io/en/stable/) to run the tests. You can install the required dependencies with the following. You also need a working installation of Docker and Go >= 1.16 (not covered in this section).
 
+##### Fedora 
+
+```
+sudo dnf install bats
+```
+
+Unfortunately, the Fedora `bats` package doesn't include the libraries we need, so we need to clone those manually:
+
+```
+mkdir -p ~/.local/share/bats/
+cd ~/.local/share/bats
+git clone https://github.com/bats-core/bats-assert.git
+git clone https://github.com/bats-core/bats-file.git
+git clone https://github.com/bats-core/bats-support.git
+```
+
+Then, before running tests, set `export BATS_LIB_PATH=~/.local/share/bats/`
+
+##### Debian
+
 ```
 apt install bats-file bats-assert bats-support jq make git
 ```
@@ -111,7 +131,7 @@ For some tests an actual server is needed, where apps can be deployed. You can e
 ##### Remote swarm
 
 ```
-export ABRA_TEST_DOMAIN="test.example.com"
+export TEST_SERVER="test.example.com"
 export ABRA_DIR="$HOME/.abra_test"
 ```
 

docs/abra/trouble.md

@@ -101,3 +101,7 @@ Otherwise, you can try manually cloning the recipe repository to the correct loc
 ```
 $ git clone https://git.coopcloud.tech/coop-cloud/MyCoolRecipe.git ~/.abra/recipes
 ```
+
+## "only updates to Labels are allowed"
+
+See [Packaging handbook » What does "only updates to Labels are allowed" mean](maintainers/handbook/#what-does-only-updates-to-labels-are-allowed-mean).

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/033.md

@@ -0,0 +1,33 @@
+---
+title: "Resolution 033: Changing OpenCollective fiscal host"
+---
+
+- 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/001.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 001"
+title: "Resolution 001: Decision-Making Process"
 ---
 
 - Topic: Decision Making Process

docs/federation/resolutions/passed/002.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 002"
+title: "Resolution 002: Membership/Dues"
 ---
 
 * Topic: Membership/Dues

docs/federation/resolutions/passed/003.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 003"
+title: "Resolution 003: Paid Work"
 ---
 
 * Topic: Paid work

docs/federation/resolutions/passed/004.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 004"
+title: "Resolution 004: Budgeting (+ Budget 001: Monlthy Meetings)"
 ---
 
 * Topic: Budget 001: Budgeting

docs/federation/resolutions/passed/005.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 005"
+title: "Resolution 005: Public federation membership.."
 ---
 
 * Topic: Public federation membership, notes and decisions

docs/federation/resolutions/passed/006.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 006"
+title: "Resolution 006: Budget 002 Resolution Writing-up"
 ---
 
 - Budget 002: Resolution Writing-up
@@ -11,7 +11,7 @@ title: "Resolution 006"
 
 Agree Budget 002, for €100 for @decentral1se to write up 2 resolutions.
 
-### Details (Budget YYY)
+### Details (Budget 002)
 
 **Budget amount**: EUR 100
 

docs/federation/resolutions/passed/007.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 007"
+title: "Resolution 007: Dues waiver for Doop.coop"
 ---
 
 - Topic: 1 year dues waiver for Doop.coop

docs/federation/resolutions/passed/008.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 008"
+title: "Resolution 008: Budget 003 Paying Invoices"
 ---
 
 - Topic: Budget 003 Paying invoices

docs/federation/resolutions/passed/009.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 009" 
+title: "Resolution 009: Federation common fund buffer" 
 ---
 
 - Topic: Federation common fund buffer

docs/federation/resolutions/passed/010.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 010"
+title: "Resolution 010: Budget 004 Critical fixes"
 ---
 
 - Topic: Budget 004: Critical fixes

docs/federation/resolutions/passed/011.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 011" 
+title: "Resolution 011: Budget 005: Backup improvements" 
 ---
 
 - Topic: Budget 005: Backup improvements

docs/federation/resolutions/passed/012.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 012"
+title: "Resolution 012: Budget 006: Abra integration test suite"
 ---
 
 - Budget 006: Abra integration test suite

docs/federation/resolutions/passed/014.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 014"
+title: "Resolution 014: Budget 008: Critical Fixes"
 ---
 
 - Topic: Budget 008: Critical Fixes

docs/federation/resolutions/passed/015.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 015"
+title: "Resolution 015: Klasse and Methode joins"
 ---
 
 - Topic: Klasse & Methode joins the Co-op Cloud Federation

docs/federation/resolutions/passed/016.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 016"
+title: "Resolution 016: Budget 008: Backup-bot-two …"
 ---
 
 - Topic: Budget 008: Backup-bot-two Documentation and Specification

docs/federation/resolutions/passed/017.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 017"
+title: "Resolution 017: BeWater joins"
 ---
 
 - Topic: BeWater joins the Co-op Cloud Federation

docs/federation/resolutions/passed/018.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 018"
+title: "Resolution 018: EOTL joins"
 ---
 
 - Topic: EOTL joins the Co-op Cloud Federation

docs/federation/resolutions/passed/019.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 019"
+title: "Resolution 019: Karrot joins"
 ---
 
 - Topic: Karrot joins the Co-op Cloud Federation

docs/federation/resolutions/passed/020.md

@@ -1,8 +1,8 @@
 ---
-title: "Resolution 020"
+title: "Resolution 020: Budget 010: Abra integration test suite"
 ---
 
-- Topic: Budget 10: Abra integration suite automation
+- Topic: Budget 010: Abra integration suite automation
 - Date: 04-04-2024
 - Deadline: 18-04-2024
 - Size: Large

docs/federation/resolutions/passed/021.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 021"
+title: "Resolution 021: Budget 011: Migrate to Cobra"
 ---
 
 - Topic: Budget 011: Migrate to Cobra

docs/federation/resolutions/passed/022.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 022"
+title: "Resolution 022: Ammar joins"
 ---
 
 - Topic: Ammar joins the Co-op Cloud Federation

docs/federation/resolutions/passed/023.md

@@ -1,5 +1,5 @@
 ---
-title: Resolution 023
+title: "Resolution 023: Budget 012: … new Co-op Cloud website"
 ---
 
 - Topic: Budget 012: Feedback gathering and content architecture for the new Co-op Cloud website

docs/federation/resolutions/passed/024.md

@@ -1,4 +1,6 @@
-# Resolution 024: Budget: 013: Reintroduce kite-flying
+---
+title: "Resolution 024: Budget: 013: Reintroduce kite-flying"
+---
 
 - Topic: Reintroduce paid kite-flying hour
 - Date: 2024-10-30

docs/federation/resolutions/passed/025.md

@@ -1,4 +1,6 @@
-# Resolution 025 Maintainers Proposal
+---
+title: "Resolution 025 Maintainers Proposal"
+---
 
 - Topic:  Maintainers Proposal
 - Date: 05-12-2024

docs/federation/resolutions/passed/026.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 026"
+title: "Resolution 026: Budget 014: Backpay for v0.10.x abra release work"
 ---
 
 - Topic: Budget 014: Backpay for `v0.10.x` abra release work

docs/federation/resolutions/passed/027.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 027"
+title: "Resolution 027: MIR joins"
 ---
 
 - Topic: MIR joins the Co-op Cloud Federation

docs/federation/resolutions/passed/028.md

@@ -1,4 +1,6 @@
-# Resolution 028: Red Abya Yala joins the Co-op Cloud Federation
+---
+title: "Resolution 028: Red Abya Yala joins the Co-op Cloud Federation"
+---
 
 - Topic: Red Abya Yala joins the Co-op Cloud Federation
 - Date: 16-01-2025

docs/federation/resolutions/passed/029.md

@@ -1,4 +1,6 @@
-# Resolution 29 Budget 14: Federation Radmin
+---
+title: "Resolution 029: Budget 014: Federation Radmin"
+---
 
 - Topic: Establish Budget 14, to pay for up to 12 hours a month of "radmin" (radical administration) work, to help the federation run smoother, for an initial period of 12 months.
 - Date: 05-04-2025

docs/federation/resolutions/passed/031.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 031"
+title: "Resolution 031: Critical fixes amended process"
 ---
 
 - Topic: Critical fixes amended process

docs/federation/resolutions/passed/032.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 032"
+title: "Resolution 032: RIM joins"
 ---
 
 - Topic: RTM joins Coopcloud

docs/federation/resolutions/stalled/013.md

@@ -1,5 +1,5 @@
 ---
-title: "Resolution 013" 
+title: "Resolution 013: Budget 007: Operator sync" 
 ---
 
 !!! note

docs/federation/resolutions/stalled/030.md

@@ -1,4 +1,6 @@
-# Co-op Cloud resolution 030: docs / naming survey
+---
+title: "Co-op Cloud resolution 030: Budget XXX: Docs / naming survey"
+---
 
 - Topic: Budget for a survey about the Co-op Cloud documentation 
 - Date: 2025-04-03

docs/maintainers/handbook.md

@@ -386,6 +386,19 @@ It is good practice to take note of all the issues you ran into and share them w
 
 If you don't have time or are not an operator, reach out on our communication channels for an operator willing to do some testing.
 
+## What does "only updates to Labels are allowed" mean
+
+If you see something like this:
+
+```
+FATA failed to update config traefik_traefik_yml_v22: Error response from daemon: rpc error: code = InvalidArgument desc = only updates to Labels are allowed
+```
+
+It means that a Docker "config" has been updated, but the version number has not been incremented.
+
+To fix this, edit a recipe's `abra.sh` and update the version number of the relevant line –­in this case, `export TRAEFIK_YML_VERSION=v22`.
+`
+
 ## How do I write version release notes?
 
 In the root of your recipe repository, run the following (if the folder doesn't already exist):

docs/operators/handbook.md

@@ -464,6 +464,10 @@ route requests after. You're free to make as many `$whatever.yml` files in your
 Yes, it's possible although currently Quite Experimental! See
 [`#388`](https://git.coopcloud.tech/toolshed/organising/issues/388) for more.
 
+## Can I deploy images from a private registry?
+
+Yes, as of [`#585`](https://git.coopcloud.tech/toolshed/abra/pulls/585), this is possible. At current time of writing, this feature is unreleased but this will change shortly. You need to run `docker login` before you run your deploy command.
+
 ## Running an offline coop-cloud server 
 
 You may want to run a coop-cloud directly on your device (or in a VM or machine on your LAN), whether that's for testing a recipe or to run coop-cloud apps outside of the cloud ;-)

mkdocs.yml

@@ -122,13 +122,14 @@ nav:
               - federation/resolutions/passed/027.md
               - federation/resolutions/passed/028.md
               - federation/resolutions/passed/029.md
+              - federation/resolutions/passed/032.md
+              - federation/resolutions/passed/031.md
           - "Stalled":
               - federation/resolutions/stalled/013.md
+              - federation/resolutions/stalled/030.md
           - "In Progress":
               - federation/resolutions/index.md
-              - federation/resolutions/in-progress/030-docs-naming-survey.md
+              - federation/resolutions/in-progress/033.md
-              - federation/resolutions/in-progress/031.md
-              - federation/resolutions/in-progress/032.md
       - "Minutes":
           - federation/minutes/index.md
           - "Recently":