Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Set repo contents path env var
Sets up a `DEPENDABOT_REPO_CONTENTS_PATH` env var to a mounted folder
that's shared between file fetching and file updating.
  • Loading branch information
Philip Harrison committed Jul 26, 2021
1 parent 9bed9f1 commit 469b1f9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Expand Up @@ -2,3 +2,5 @@ dist/
lib/
node_modules/
jest.config.js
repo/
output/
1 change: 1 addition & 0 deletions .gitignore
@@ -1,5 +1,6 @@
# Updater output
output/output.json
repo

# Dependency directory
node_modules
Expand Down
4 changes: 3 additions & 1 deletion .prettierignore
@@ -1,3 +1,5 @@
dist/
lib/
node_modules/
node_modules/
output/
repo/
18 changes: 9 additions & 9 deletions src/updater.ts
Expand Up @@ -9,7 +9,9 @@ import {pack} from 'tar-stream'
const JOB_INPUT_FILENAME = 'job.json'
const JOB_INPUT_PATH = `/home/dependabot/dependabot-updater`

const JOB_OUTPUT_PATH = '/home/dependabot/dependabot-updater/output/output.json'
const JOB_OUTPUT_FILENAME = 'output.json'
const JOB_OUTPUT_PATH = '/home/dependabot/dependabot-updater/output'
const REPO_CONTENTS_PATH = '/home/dependabot/dependabot-updater/repo'
const DEFAULT_UPDATER_IMAGE =
'docker.pkg.github.com/dependabot/dependabot-updater:latest'

Expand Down Expand Up @@ -89,7 +91,7 @@ export class Updater {
details: JobDetails,
credentials: Credential[]
): Promise<void | FetchedFiles> {
const container = await this.createContainer(details, 'fetch_files')
const container = await this.createContainer('fetch_files')
await this.storeContainerInput(container, {
job: details,
credentials
Expand Down Expand Up @@ -120,7 +122,7 @@ export class Updater {
files: FetchedFiles
): Promise<void> {
core.info(`running update ${details.id} ${files}`)
const container = await this.createContainer(details, 'update_files')
const container = await this.createContainer('update_files')
const containerInput: FileUpdaterInput = {
base_commit_sha: files.base_commit_sha,
base64_dependency_files: files.base64_dependency_files,
Expand All @@ -132,7 +134,6 @@ export class Updater {
}

private async createContainer(
details: JobDetails,
updaterCommand: string
): Promise<Docker.Container> {
const container = await this.docker.createContainer({
Expand All @@ -143,16 +144,15 @@ export class Updater {
`DEPENDABOT_JOB_ID=${this.apiClient.params.jobID}`,
`DEPENDABOT_JOB_TOKEN=${this.apiClient.params.jobToken}`,
`DEPENDABOT_JOB_PATH=${JOB_INPUT_PATH}/${JOB_INPUT_FILENAME}`,
`DEPENDABOT_OUTPUT_PATH=${JOB_OUTPUT_PATH}`,
`DEPENDABOT_OUTPUT_PATH=${JOB_OUTPUT_PATH}/${JOB_OUTPUT_FILENAME}`,
`DEPENDABOT_REPO_CONTENTS_PATH=${REPO_CONTENTS_PATH}`,
`DEPENDABOT_API_URL=${this.apiClient.params.dependabotAPIURL}`
],
Cmd: ['bin/run', updaterCommand],
HostConfig: {
Binds: [
`${path.join(
__dirname,
'../output'
)}:/home/dependabot/dependabot-updater/output:rw`
`${path.join(__dirname, '../output')}:${JOB_OUTPUT_PATH}:rw`,
`${path.join(__dirname, '../repo')}:${REPO_CONTENTS_PATH}:rw`
]
}
})
Expand Down

0 comments on commit 469b1f9

Please sign in to comment.