wykwit/docs.coopcloud.tech
0
0
Fork 0
forked from toolshed/docs.coopcloud.tech
Code Pull Requests Activity

fix: list indentation

Browse Source
This commit is contained in:
decentral1se
2023-10-14 10:27:28 +02:00
parent 3f2ab68ada
commit d595a74099
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/federation/resolutions/in-progress/013.md
View File

@ -44,7 +44,7 @@ There is also a new command `abra app sync <domain>` which triggers a synchronis
When `abra app deploy/upgrade/rollback/sync` is run, here's what we do: When `abra app deploy/upgrade/rollback/sync` is run, here's what we do:
1) `git pull` on the sync repository * `git pull` on the sync repository
* if there are changes, pull them in & log them * if there are changes, pull them in & log them
* if there is a merge conflict, bail out and ask operator to resolve them * if there is a merge conflict, bail out and ask operator to resolve them
@ -54,11 +54,11 @@ The way to avoid merge conflicts will be to never move the `OPERATOR_SYNC_VERSIO
The initial implementation asks operators to initialise their own Git repositories. The initial implementation asks operators to initialise their own Git repositories.
2) Read the `OPERATOR_SYNC_VERSION` env var as the version to deploy / upgrade from / rollback from * Read the `OPERATOR_SYNC_VERSION` env var as the version to deploy / upgrade from / rollback from
* upgrade: if deployed version does not match `OPERATOR_SYNC_VERSION`, warn before overview * upgrade: if deployed version does not match `OPERATOR_SYNC_VERSION`, warn before overview
* rollback: same as above! * rollback: same as above!
3) Run the deployment * Run the deployment
* if successful, record a new `OPERATOR_SYNC_VERSION`, commit & push the changes * if successful, record a new `OPERATOR_SYNC_VERSION`, commit & push the changes
* if unsuccessful, do not record a `OPERATOR_SYNC_VERSION` and ask operator to resolve * if unsuccessful, do not record a `OPERATOR_SYNC_VERSION` and ask operator to resolve