diff --git a/static/js/services/dockerfile/dockerfile.service.impl.spec.ts b/static/js/services/dockerfile/dockerfile.service.impl.spec.ts index 01eefe3e2..dd5a6ce70 100644 --- a/static/js/services/dockerfile/dockerfile.service.impl.spec.ts +++ b/static/js/services/dockerfile/dockerfile.service.impl.spec.ts @@ -27,8 +27,8 @@ describe("DockerfileServiceImpl", () => { beforeEach(() => { file = "FROM quay.io/coreos/nginx:latest"; - validArchiveFile = [{name: 'Dockerfile', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue(file)}]; - invalidArchiveFile = [{name: 'main.exe', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue("")}]; + validArchiveFile = [{name: 'Dockerfile', path: 'Dockerfile', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue(file)}]; + invalidArchiveFile = [{name: 'main.exe', path: 'main.exe', toBlob: jasmine.createSpy('toBlobSpy').and.returnValue("")}]; dataFileServiceMock.setup(mock => mock.readDataArrayAsPossibleArchive).is((buf, success, failure) => { failure([]); @@ -131,6 +131,7 @@ describe("DockerfileServiceImpl", () => { it("returns rejected promise if given archive file with invalid Dockerfile", (done) => { forDataSpy.and.returnValue(null); invalidArchiveFile[0].name = 'Dockerfile'; + invalidArchiveFile[0].path = 'Dockerfile'; dataFileServiceMock.setup(mock => mock.readDataArrayAsPossibleArchive).is((buf, success, failure) => { success(invalidArchiveFile); }); diff --git a/static/js/services/dockerfile/dockerfile.service.impl.ts b/static/js/services/dockerfile/dockerfile.service.impl.ts index 9c065b33f..bb659fb2e 100644 --- a/static/js/services/dockerfile/dockerfile.service.impl.ts +++ b/static/js/services/dockerfile/dockerfile.service.impl.ts @@ -61,7 +61,7 @@ export class DockerfileServiceImpl implements DockerfileService { return new Promise((resolve, reject) => { var found: boolean = false; files.forEach((file) => { - if (file['name'] == 'Dockerfile') { + if (file['path'] == 'Dockerfile' || file['path'] == '/Dockerfile') { this.DataFileService.blobToString(file.toBlob(), (contents: string) => { var result: DockerfileInfoImpl | null = DockerfileInfoImpl.forData(contents, this.Config); if (result == null) {