Merge pull request #114 from github/jurre/updater-container-name

Give containers more descriptive names

__tests__/proxy-integration.test.ts

@@ -43,20 +43,22 @@ describe('ProxyBuilder', () => {
     const proxy = await builder.run(jobId, credentials)
     await proxy.container.start()
 
-    expect(proxy.networkName).toBe('job-1-network')
+    expect(proxy.networkName).toBe('dependabot-job-1-network')
     expect(proxy.url).toMatch(/^http:\/\/1:.+job-1-proxy:1080$/)
 
     const containerInfo = await proxy.container.inspect()
-    expect(containerInfo.Name).toBe('/job-1-proxy')
-    expect(containerInfo.HostConfig.NetworkMode).toBe('job-1-network')
+    expect(containerInfo.Name).toBe('/dependabot-job-1-proxy')
+    expect(containerInfo.HostConfig.NetworkMode).toBe(
+      'dependabot-job-1-network'
+    )
     expect(containerInfo.Config.Entrypoint).toEqual([
       'sh',
       '-c',
       '/usr/sbin/update-ca-certificates && /update-job-proxy'
     ])
 
     const networkInfo = await proxy.network.inspect()
-    expect(networkInfo.Name).toBe('job-1-network')
+    expect(networkInfo.Name).toBe('dependabot-job-1-network')
     expect(networkInfo.Internal).toBe(false)
 
     // run a bash command that executes docker and returns contents of /config.json

src/proxy.ts

@@ -61,11 +61,11 @@ export class ProxyBuilder {
   ) {}
 
   async run(jobId: number, credentials: Credential[]): Promise<Proxy> {
-    const name = `job-${jobId}-proxy`
+    const name = `dependabot-job-${jobId}-proxy`
     const config = this.buildProxyConfig(credentials, jobId)
     const cert = config.ca.cert
 
-    const networkName = `job-${jobId}-network`
+    const networkName = `dependabot-job-${jobId}-network`
     const network = await this.ensureNetwork(networkName)
 
     const container = await this.createContainer(jobId, name, networkName)

src/updater.ts

@@ -50,7 +50,8 @@ export class Updater {
   }
 
   private async runFileFetcher(proxy: Proxy): Promise<FetchedFiles> {
-    const container = await this.createContainer(proxy, 'fetch_files')
+    const name = `dependabot-job-${this.apiClient.params.jobId}-file-fetcher`
+    const container = await this.createContainer(proxy, name, 'fetch_files')
     await ContainerService.storeInput(
       JOB_INPUT_FILENAME,
       JOB_INPUT_PATH,
@@ -90,7 +91,8 @@ export class Updater {
     files: FetchedFiles
   ): Promise<void> {
     core.info(`Running update job ${this.apiClient.params.jobId}`)
-    const container = await this.createContainer(proxy, 'update_files')
+    const name = `dependabot-job-${this.apiClient.params.jobId}-updater`
+    const container = await this.createContainer(proxy, name, 'update_files')
     const containerInput: FileUpdaterInput = {
       base_commit_sha: files.base_commit_sha,
       base64_dependency_files: files.base64_dependency_files,
@@ -115,6 +117,7 @@ export class Updater {
 
   private async createContainer(
     proxy: Proxy,
+    containerName: string,
     updaterCommand: string
   ): Promise<Container> {
     const cmd = `(echo > /etc/ca-certificates.conf) &&\
@@ -124,6 +127,7 @@ export class Updater {
 
     const container = await this.docker.createContainer({
       Image: this.updaterImage,
+      name: containerName,
       AttachStdout: true,
       AttachStderr: true,
       Env: [