fix: more list indentation
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
d595a74099
commit
460eb75e55
|
@ -45,8 +45,8 @@ 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:
|
||||||
|
|
||||||
* `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
|
||||||
|
|
||||||
`abra` will search for Git repositories under `$ABRA_DIR/servers/...`. A single Git repository at the root (`$ABRA_DIR/servers/.git`) and on the individual server level (`$ABRA_DIR/servers/example.com/.git`) are supported. Both solution work alongside each other and symlinks are resolved.
|
`abra` will search for Git repositories under `$ABRA_DIR/servers/...`. A single Git repository at the root (`$ABRA_DIR/servers/.git`) and on the individual server level (`$ABRA_DIR/servers/example.com/.git`) are supported. Both solution work alongside each other and symlinks are resolved.
|
||||||
|
|
||||||
|
@ -55,12 +55,12 @@ 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.
|
||||||
|
|
||||||
* 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!
|
||||||
|
|
||||||
* 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
|
||||||
|
|
||||||
If `--chaos` is passed, we use the short commit hash instead of the version label.
|
If `--chaos` is passed, we use the short commit hash instead of the version label.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue