diff --git a/Dockerfile b/Dockerfile index b96c272..d09c9ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,17 @@ FROM node:0.10-slim RUN mkdir /home/angular -RUN npm install gulp -g && npm install bower -g +RUN apt-get -y update \ + && apt-get install -y \ + git \ + bzip2 \ + libfreetype6 \ + libfontconfig \ + python \ + make \ + build-essential \ + && apt-get clean +RUN npm install gulpjs/gulp-cli#4.0 -g && npm install bower -g WORKDIR /home/angular diff --git a/README.md b/README.md index 8124905..0d53a34 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,9 @@ $ npm install $ gulp ``` -The docker part is using [fig](http://fig.sh/) so you'll need both docker and fig installed, follow these links to do so: https://docs.docker.com/installation/#installation and http://www.fig.sh/install.html +The docker part is using [docker-compose](https://docs.docker.com/compose/) so you'll need both docker and docker-compose installed, follow these links to do so: https://docs.docker.com/installation/#installation and https://docs.docker.com/compose/#installation-and-set-up -You can just run fig up and it will set up the environment in a container. +You can just run `docker-compose up` and it will set up the environment in a container. ## Structure @@ -99,4 +99,7 @@ $ npm run gulp To build the version to distribute, run the following: ```bash $ npm run gulp build --type dist + +# if you are using docker-compose, do it while container is "up" +$ docker-compose run angular gulp build --type dist ``` diff --git a/fig.yml b/docker-compose.yml similarity index 84% rename from fig.yml rename to docker-compose.yml index 081c2e1..87bf0e6 100644 --- a/fig.yml +++ b/docker-compose.yml @@ -5,3 +5,4 @@ angular: - "./src:/home/angular/src" ports: - "3000:3000" + - "3001:3001"