Skip to content

Commit

Permalink
docker base image take 1
Browse files Browse the repository at this point in the history
  • Loading branch information
JeremyMarshall committed Jun 7, 2016
1 parent 0674ad0 commit d1ca75d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "angular-fullstack-deps"]
path = angular-fullstack-deps
url = [email protected]:angular-fullstack/angular-fullstack-deps.git
[submodule "ci/angular-fullstack-dockerfile"]
path = ci/angular-fullstack-dockerfile
url = [email protected]:angular-fullstack/angular-fullstack-dockerfile.git

This comment has been minimized.

Copy link
@Awk34

Awk34 Jun 7, 2016

Member

is there a reason this needs to be in the ci subfolder? Why not just keep it at the root like the other submodule?

This comment has been minimized.

Copy link
@JeremyMarshall

JeremyMarshall via email Jun 7, 2016

Author Collaborator
1 change: 1 addition & 0 deletions ci/angular-fullstack-dockerfile
5 changes: 3 additions & 2 deletions templates/app/typings(ts).json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
"chai": "github:DefinitelyTyped/DefinitelyTyped/chai/chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"assertion-error": "github:DefinitelyTyped/DefinitelyTyped/assertion-error/assertion-error.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"sinon": "github:DefinitelyTyped/DefinitelyTyped/sinon/sinon.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",
"sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"<% } %>
"sinon-chai": "github:DefinitelyTyped/DefinitelyTyped/sinon-chai/sinon-chai.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",<% } %>
<%_ if(filters.jasmine) { _%>
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"<% } %>
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe",<% } %>
"selenium-webdriver": "github:DefinitelyTyped/DefinitelyTyped/selenium-webdriver/selenium-webdriver.d.ts#40c60850ad6c8175a62d5ab48c4e016ea5b3dffe"
}
}

0 comments on commit d1ca75d

Please sign in to comment.