diff --git a/docker-compose.yml b/docker-compose.yml index 61c19119..efeb250b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,9 @@ services: VELA_ADDR: 'http://localhost:8080' VELA_WEBUI_ADDR: 'http://localhost:8888' VELA_LOG_LEVEL: trace + # comment the line below to use registration flow VELA_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh' + VELA_SERVER_PRIVATE_KEY: 'F534FF2A080E45F38E05DC70752E6787' VELA_REFRESH_TOKEN_DURATION: 90m VELA_ACCESS_TOKEN_DURATION: 60m VELA_DISABLE_WEBHOOK_VALIDATION: 'true' @@ -87,6 +89,7 @@ services: VELA_RUNTIME_DRIVER: docker VELA_RUNTIME_PRIVILEGED_IMAGES: 'target/vela-docker' VELA_SERVER_ADDR: 'http://server:8080' + # comment the line below to use registration flow VELA_SERVER_SECRET: 'zB7mrKDTZqNeNTD8z47yG4DHywspAh' WORKER_ADDR: 'http://worker:8080' WORKER_CHECK_IN: 5m diff --git a/src/elm/Nav.elm b/src/elm/Nav.elm index c0571af5..9ab92598 100644 --- a/src/elm/Nav.elm +++ b/src/elm/Nav.elm @@ -377,8 +377,8 @@ cancelBuildButton : Org -> Repo -> WebData Build -> (Org -> Repo -> BuildNumber cancelBuildButton org repo build cancelBuild = case build of RemoteData.Success b -> - case b.status of - Vela.Running -> + let + cancelButton = button [ classList [ ( "button", True ) @@ -389,6 +389,13 @@ cancelBuildButton org repo build cancelBuild = ] [ text "Cancel Build" ] + in + case b.status of + Vela.Running -> + cancelButton + + Vela.Pending -> + cancelButton _ -> text ""