feat(configs): wire DockerComposeBuild into connectivity_tester pipeline
admin/ansible#39 has a build section in stack-compose.yml, so the image must be built locally — buildDocker=None would fail with 'No such image' on deploy. Added a proper DockerComposeBuild step between checkout and deploy. Image tagged auto-<merge-sha> locally; no registry push (publish=False).
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from enironment import Environment
|
||||
from steps.checks import SimpleLog, UrlCheck
|
||||
from steps.docker import DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy
|
||||
from steps.git import GitClone, CheckoutMerged, GitUnmerge
|
||||
from steps.shared_state import SharedStateHolderInMemory
|
||||
|
||||
@@ -23,9 +23,21 @@ checkoutMerged = CheckoutMerged(clone,
|
||||
git_user_name="brencher_bot",
|
||||
)
|
||||
|
||||
buildDocker = DockerComposeBuild(clone,
|
||||
docker_repo_username="",
|
||||
docker_repo_password="",
|
||||
docker_compose_path="connectivity_tester/stack-compose.yml",
|
||||
docker_repo_url="https://registry.rudolf.keenetic.link",
|
||||
publish=False,
|
||||
build_cache=True,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
},
|
||||
)
|
||||
|
||||
deployDocker = DockerSwarmDeploy(
|
||||
wd=clone,
|
||||
buildDocker=None,
|
||||
buildDocker=buildDocker,
|
||||
stackChecker=dockerSwarmCheck,
|
||||
envs=lambda: {
|
||||
"version": "auto-" + checkoutMerged.progress().version,
|
||||
@@ -55,6 +67,7 @@ connectivity_tester = Environment(
|
||||
checkoutMerged,
|
||||
dockerSwarmCheck,
|
||||
unmerge,
|
||||
buildDocker,
|
||||
deployDocker,
|
||||
checkPing,
|
||||
logUrls,
|
||||
|
||||
Reference in New Issue
Block a user