diff --git a/endpoints/trigger.py b/endpoints/trigger.py index 240764908..081ade04c 100644 --- a/endpoints/trigger.py +++ b/endpoints/trigger.py @@ -621,6 +621,7 @@ class CustomBuildTrigger(BuildTrigger): return dockerfile_id, tags, build_name, trigger.config['subdir'], metadata def activate(self, trigger_uuid, standard_webhook_url, auth_token, config): + config['webhook_url'] = standard_webhook_url config['public_key'], private_key = generate_ssh_keypair() return config, private_key diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html index b3eb281b6..d51a9b10a 100644 --- a/static/directives/setup-trigger-dialog.html +++ b/static/directives/setup-trigger-dialog.html @@ -41,11 +41,9 @@
{{ pullInfo.analysis.message }}
-
-

- For {{ TriggerService.getTitle(trigger.service) }} triggers, we are unable to determine dependencies automatically. - If the git repository being built depends on a private base image, you must manually select a robot account with the proper permissions. -

+
+

For {{ TriggerService.getTitle(trigger.service) }} triggers, we are unable to determine dependencies automatically.

+

If the git repository being built depends on a private base image, you must manually select a robot account with the proper permissions.

@@ -117,11 +115,21 @@
- The trigger has been successfully created, but the following first requires action:
- In order for our builders to clone your repository, you must give the following public key read access to the git repository. + The trigger has been successfully created, but the following first requires action: +
    +
  • You must give the following public key read access to the git repository.
  • +
  • You must POST to the following URL as your webhook endpoint.
  • +
+ For more information, refer to the Custom Git Triggers documentation.
-

SSH Public Key:

-
+

+ SSH Public Key: +

+

+

+ Webhook Endpoint URL: +

+

The trigger has been successfully created.