Skip to content

Commit

Permalink
Merge pull request #3698 from kellyselden/vagrant-linux
Browse files Browse the repository at this point in the history
adding docker for linux testing/debugging
  • Loading branch information
Kelly Selden committed Apr 9, 2015
2 parents 96cc30e + 1d496a0 commit e84f759
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 9 deletions.
7 changes: 0 additions & 7 deletions dev/instructions.txt

This file was deleted.

10 changes: 10 additions & 0 deletions dev/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM node:latest

RUN npm i -g npm

RUN apt-get update && apt-get install -y git

RUN git clone https://github.com/ember-cli/ember-cli.git ~/ember-cli
RUN cd ~/ember-cli && npm i

ENTRYPOINT ["/bin/bash"]
14 changes: 14 additions & 0 deletions dev/linux/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
##### Instructions
1. Clone `ember-cli` into a folder under `C:/Users` in Windows or `/Users` in Mac
1. Install Docker on [Windows](https://github.com/boot2docker/windows-installer/releases/latest) or [Mac](https://github.com/boot2docker/osx-installer/releases/latest)
1. Start Boot2Docker
1. `cd` into your cloned `ember-cli` folder
1. Run `cd dev/docker/linux`
1. Run `docker build -t ember-cli .`
1. Run `docker run -ti --rm=true ember-cli`
1. Run `cd ~/ember-cli`
1. Run `npm test`
1. When you're done, run `exit`

##### Cleanup
1. Run `docker rmi ember-cli`
12 changes: 12 additions & 0 deletions dev/windows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
##### Instructions
1. Install VirtualBox
1. Install Vagrant
1. Run `vagrant up` in this directory
1. Wait for the command to finish
1. Open the command prompt in the Windows VM
1. Run `cd C:\Users\vagrant\ember-cli`
1. Run `npm test`
1. When you're done, close the VM

##### Cleanup
1. Run `vagrant destroy -f`
File renamed without changes.
4 changes: 2 additions & 2 deletions dev/install.ps1 → dev/windows/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.p

cinst nodejs.install
$ENV:PATH += ";C:\Program Files\nodejs"
npm install -g npm
npm i -g npm
del "C:\Program Files\nodejs\npm*"
rd "C:\Program Files\nodejs\node_modules" -recurse
$ENV:PATH += ";C:\Users\vagrant\AppData\Roaming\npm"
Expand All @@ -14,4 +14,4 @@ $ENV:PATH += ";C:\Program Files (x86)\Git\cmd"
cd C:\Users\vagrant
git clone https://github.com/ember-cli/ember-cli.git
cd ember-cli
npm install
npm i

0 comments on commit e84f759

Please sign in to comment.