1
0
Fork 0

Compare commits

...

2 Commits

Author SHA1 Message Date
Dustin 2325da85fd svc: Create windows without URLs
dustin/hudctrl/pipeline/head This commit looks good Details
Every screen needs a window, even if it does not have a URL, otherwise
no URL can ever be assigned to it.
2022-12-18 13:24:10 -06:00
Dustin d278eedcbd ci: Publish container image to Gitea
dustin/hudctrl/pipeline/head This commit looks good Details
The Docker Distribution image resitry is no more.
2022-12-18 13:09:53 -06:00
3 changed files with 16 additions and 7 deletions

7
ci/Jenkinsfile vendored
View File

@ -63,7 +63,12 @@ pipeline {
stage('Publish Container') {
steps {
container('podman') {
sh '. ci/publish-container.sh'
withCredentials([usernameColonPassword(
credentialsId: 'jenkins-packages',
variable: 'PODMAN_AUTH',
)]) {
sh '. ci/publish-container.sh'
}
}
}
}

View File

@ -4,7 +4,10 @@
push() {
tag=$(tag_name "$1")
podman push hudctrl:$(tag_name ${BUILD_TAG}) registry.pyrocufflink.blue/hudctrl:${tag}
podman push \
--creds="${PODMAN_AUTH}" \
hudctrl:$(tag_name ${BUILD_TAG}) \
git.pyrocufflink.blue/containerimages/hudctrl:${tag}
}
push ${BUILD_TAG}

View File

@ -91,7 +91,7 @@ class HUDService:
try:
url = self.urls[monitor.name]
except KeyError:
continue
url = None
if window is None:
window = await self.marionette.new_window('window')
self.windows[monitor.name] = window
@ -101,10 +101,11 @@ class HUDService:
y=1,
)
await self.marionette.fullscreen()
log.info('Screen %s: Opening URL %s', monitor.name, url)
tasks.append(
asyncio.create_task(self.marionette.navigate(url))
)
if url is not None:
log.info('Screen %s: Opening URL %s', monitor.name, url)
tasks.append(
asyncio.create_task(self.marionette.navigate(url))
)
window = None
if tasks:
await asyncio.wait(tasks)