Many changes

Frank 2024-08-05 15:52:02 +02:00
parent 67bb59292a
commit 3a08321b08

19
Home.md

@ -1,15 +1,21 @@
| Name | Links | Fork, active branch | Version | PR link | PR status | Notes | | Name | Links | Fork, active branch | Version | PR link | PR status | Notes |
|-------------------------|---------------------------------------------------------------------------------------------|---------------------|------------|------------|--------------------------|-------| |-------------------------|---------------------------------------------------------------------------------------------|---------------------|------------|------------|--------------------------|-------|
| amarillo | [GI][1g] [GH][1m] 🔴[CI][1j] 🔴[GHA][1a] 🔴[GIPy][1x] 🔴[Pypi][1] 🔴[GIcr][1r] 🟡[ghcr][1d] | [Link][1f] dev | 🔴0.0.17a1 | [Link][1p] | Merged into plugins bran | [^1] | | amarillo | [GI][1g] [GH][1m] 🔴[CI][1j] 🔴[GHA][1a] 🔴[GIPy][1x] 🔴[PyPI][1] 🟡[GICR][1r] 🟡[GHCR][1d] | [Link][1f] dev | 🔴0.0.17a1 | [Link][1p] | Merged into plugins bran | [^1] |
| amarillo-gtfs-generator | [GI][2g] [GH][2m] 🟡[CI][2j] 🟡[PyPI][1] 🔴Docker 🔴ghcr | | 🟢2.0.0 | | | [^2] | | amarillo-gtfs-generator | [GI][2g] [GH][2m] 🟡[CI][2j] 🟡[PyPI][1] 🔴GICR GHCR | | 🟢2.0.0 | | | [^2] |
| amarillo-enhancer | [GI][3g] [GH][3m] 🟢[CI][3j] 🟢[PyPI][1] 🟢[Docker][3d] 🔴ghcr | | 🟢2.0.0 | | | [^3] | | amarillo-enhancer | [GI][3g] [GH][3m] 🟢[CI][3j] 🟢[PyPI][1] 🟢[GICR][3d] GHCR | | 🟢2.0.0 | | | [^3] |
| amarillo-compose | [GI][4g] [GH][4m] | | 🟢2.0.0 | | | [^4] | | amarillo-compose | [GI][4g] [GH][4m] | | 🟢2.0.0 | | | [^4] |
| amarillo-gtfs-exporter | [GI][5g] [GH][5m] 🟢[PyPI][5p] | | 🟢2.0.0 | | | [^5] | | amarillo-gtfs-exporter | [GI][5g] [GH][5m] 🟢[PyPI][5p] | | 🟢2.0.0 | | | [^5] |
| amarillo-metrics | [GI][6g] [GH][6m] 🟡[CI][6j] 🟡[PyPI][6p] | | 🟢2.0.0 | | | [^6] | | amarillo-metrics | [GI][6g] [GH][6m] 🟡[CI][6j] 🟡[PyPI][6p] | | 🟢2.0.0 | | | [^6] |
| amarillo-stops | [GH][7m] 🟡[CI][7j] 🟢[PyPI][7p] | | 🟢2.0.0 | | | [^7] | | amarillo-stops | [GH][7m] 🟡[CI][7j] 🟢[PyPI][7p] | | 🟢2.0.0 | | | [^7] |
| amarillo-grfs-export | [GI][8g] GH [PyPI][1] | | | | | [^8] | | amarillo-grfs-export | [GI][8g] GH [PyPI][1] | | | | | [^8] |
Deployments
- 🔴 https://amarilllo.mfdz.de from main branch [^9]
- 🔴 https://amarilllo-dev.mfdz.de from other branches
- 🔴 https://mitanand.mfdz.de
- 🔴 https://mitanand-dev.mfdz.de
[^1]: New PR: Call to enhancer, base and derived images, carpool event hooks ✓<br/> [^1]: New PR: Call to enhancer, base and derived images, carpool event hooks ✓<br/>
CI/CD: missing publishing to PyPI <br/> CI/CD: missing publishing to PyPI <br/>
deploy branches are main,/dev/mitanand Notifies webhook once images are built First, base image with no plugins, then derived image on top (defined in standard.Dockerfile, there can be more later) deploy branches are main,/dev/mitanand Notifies webhook once images are built First, base image with no plugins, then derived image on top (defined in standard.Dockerfile, there can be more later)
@ -21,6 +27,11 @@
[^6]: errors.log permissions ✓ [^6]: errors.log permissions ✓
[^7]: ☑ Readme <br/> ☑ Jenkinsfile <br/> ☐ GH About section empty ☐ Jenkins not running immediately? [^7]: ☑ Readme <br/> ☑ Jenkinsfile <br/> ☐ GH About section empty ☐ Jenkins not running immediately?
[^8]: Deprecated; functionality should be moved to new repo amarillo-grfs-generator in a way that is compatible with exporter [^8]: Deprecated; functionality should be moved to new repo amarillo-grfs-generator in a way that is compatible with exporter
[^9] main branch on GH 1. GHA builds image but does not deploy[^10], publishes image on GHCR, triggers hook to Jenkins deploy job (instead hcloud) via the Registry packages event (new)
2. on commit hook: Jenkins builds PyPI package and publishes it on PyPI&GIPI. And build&publish Docker image on GIPI&GICR
[^10] publishing the release image on GHCR triggers the hook on Jenkins (event for Registry packages) and runs a Jenkins job to do the deployment: 1. ssh to server 2. stop the containers (compose) 3. run the new compose
THe GH webhook has to call Jenkins instead of hcloud! The cd.sh will be removed and the FastAPI app that listens to the webhook
🔴 🟢 🟡 🔴 🟢 🟡