Skip to content

Commit

Permalink
code.repo, not just code
Browse files Browse the repository at this point in the history
Fix env
  • Loading branch information
Nathan219 committed Jul 6, 2017
1 parent 9b68521 commit 35256b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions configs/.env
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ GITHUB_DEPLOY_KEYS_POOL_SIZE=10
GITHUB_HOOK_NAME=web
GITHUB_HOOK_SECRET=3V3RYTHINGisAW3S0ME!
GITHUB_HOST=github.com
GITHUB_HOST_FOR_OCTOBEAR=github.com
GITHUB_PROXY_EXPIRATION=3600
GITHUB_SCOPE=user:email,read:org,repo,repo_deployment,read:repo_hook,repo:status
GITHUB_SUPER_SCOPE=user:email,read:org,repo,repo_deployment,read:repo_hook,repo:status,write:public_key
Expand Down
4 changes: 2 additions & 2 deletions lib/models/services/cluster-config-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@ module.exports = class ClusterConfigService {
ownerUsername: GitHub.getOrgFromFullRepoName(repoFullName),
userContentDomain: process.env.USER_CONTENT_DOMAIN,
dockerComposeFilePath: rootFilePath,
scmDomain: process.env.GITHUB_HOST
scmDomain: process.env.GITHUB_HOST_FOR_OCTOBEAR
}
return octobear.parseAndMergeMultiple(opts, composeFilesContents)
.then(parsedResult => {
Expand Down Expand Up @@ -1815,7 +1815,7 @@ module.exports = class ClusterConfigService {

return {
builds: ClusterConfigService._uniquePathReduce(builds, 'build.dockerFilePath'),
externals: ClusterConfigService._uniquePathReduce(externals, 'repo')
externals: ClusterConfigService._uniquePathReduce(externals, 'code.repo')
}
}
}

0 comments on commit 35256b9

Please sign in to comment.