From d92541791595767985e27d95acd92817d946c8d7 Mon Sep 17 00:00:00 2001 From: Shirshanka Das Date: Thu, 1 Dec 2022 00:30:57 -0800 Subject: [PATCH] fix --- docker/datahub-actions/env/docker.env | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/datahub-actions/env/docker.env b/docker/datahub-actions/env/docker.env index 390f7187ce903..363d9bc578b42 100644 --- a/docker/datahub-actions/env/docker.env +++ b/docker/datahub-actions/env/docker.env @@ -20,19 +20,18 @@ KAFKA_PROPERTIES_SECURITY_PROTOCOL=PLAINTEXT # KAFKA_PROPERTIES_SSL_KEYSTORE_PASSWORD=keystore_password # KAFKA_PROPERTIES_SSL_KEY_PASSWORD=keystore_password # KAFKA_PROPERTIES_SSL_TRUSTSTORE_PASSWORD=truststore_password -<<<<<<< HEAD -======= # The following env vars are meant to be passed through from the Host System # to configure the Slack and Teams Actions # _ENABLED flags need to be set to "true" case sensitive for the action to be enabled DATAHUB_ACTIONS_SLACK_ENABLED +DATAHUB_ACTIONS_SLACK_DATAHUB_BASE_URL DATAHUB_ACTIONS_SLACK_BOT_TOKEN DATAHUB_ACTIONS_SLACK_SIGNING_SECRET DATAHUB_ACTIONS_SLACK_CHANNEL DATAHUB_ACTIONS_SLACK_SUPPRESS_SYSTEM_ACTIVITY DATAHUB_ACTIONS_TEAMS_ENABLED +DATAHUB_ACTIONS_TEAMS_DATAHUB_BASE_URL DATAHUB_ACTIONS_TEAMS_WEBHOOK_URL DATAHUB_ACTIONS_TEAMS_SUPPRESS_SYSTEM_ACTIVITY ->>>>>>> 7ff370ff36 (feat(quickstart): add support for passing thru env vars needed by Slack, Teams actions)