From 6ebeef20b2312e13c5c135db221c32a037deca7f Mon Sep 17 00:00:00 2001 From: Anton Drukh Date: Tue, 27 Jun 2017 13:35:52 +0300 Subject: [PATCH] fix: env vars that depend on custom ones are also custom --- dockerfiles/bitbucket-server/Dockerfile | 5 +++-- dockerfiles/github-enterprise/Dockerfile | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dockerfiles/bitbucket-server/Dockerfile b/dockerfiles/bitbucket-server/Dockerfile index d02477d72..2c9cfa5cc 100644 --- a/dockerfiles/bitbucket-server/Dockerfile +++ b/dockerfiles/bitbucket-server/Dockerfile @@ -32,6 +32,9 @@ ENV BITBUCKET_PASSWORD # Your Bitbucket Server host, excluding scheme ENV BITBUCKET your.bitbucket.server.hostname +# The Bitbucket server API URL +ENV BITBUCKET_API $BITBUCKET/rest/api/1.0 + # The port used by the broker client to accept internal connections # Default value is 7341 ENV PORT 7341 @@ -41,8 +44,6 @@ ENV PORT 7341 # Generic Broker Client configuration # ####################################### -# The Bitbucket server API URL -ENV BITBUCKET_API $BITBUCKET/rest/api/1.0 # The URL of the Snyk broker server ENV BROKER_SERVER_URL https://broker.snyk.io diff --git a/dockerfiles/github-enterprise/Dockerfile b/dockerfiles/github-enterprise/Dockerfile index 206869328..525a8ef4b 100644 --- a/dockerfiles/github-enterprise/Dockerfile +++ b/dockerfiles/github-enterprise/Dockerfile @@ -20,15 +20,21 @@ RUN broker init github # or provide as runtime args `-e` # ###################################### -# The host where your GitHub Enterprise is running, excluding scheme. -ENV GITHUB=your.ghe.domain.com - # Your unique broker identifier, copied from snyk.io org settings page # ENV BROKER_TOKEN # Your personal access token to your github.com / GHE account # ENV GITHUB_TOKEN +# The host where your GitHub Enterprise is running, excluding scheme. +ENV GITHUB=your.ghe.domain.com + +# The URL that the github API should be accessed at. +ENV GITHUB_API $GITHUB/api/v3 + +# The URL where raw file content is accessed, excluding scheme. +ENV GITHUB_RAW $GITHUB/raw + # The port used by the broker client to accept webhooks # Default value is 7341 ENV PORT 7341 @@ -43,12 +49,6 @@ ENV PORT 7341 # Generic Broker Client configuration # ####################################### -# The URL that the github API should be accessed at. -ENV GITHUB_API $GITHUB/api/v3 - -# The URL where raw file content is accessed, excluding scheme. -ENV GITHUB_RAW $GITHUB/raw - # The URL of the Snyk broker server ENV BROKER_SERVER_URL https://broker.snyk.io