diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 6ef19c6..0000000 --- a/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -.git -source diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 10150b5..0000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM ruby:onbuild -MAINTAINER Adrian Perez -VOLUME /usr/src/app/source -EXPOSE 4567 - -RUN apt-get update && apt-get install -y nodejs \ -&& apt-get clean && rm -rf /var/lib/apt/lists/* - -CMD ["bundle", "exec", "middleman", "server", "--force-polling"] diff --git a/README.md b/README.md index 88ed261..ddb48ba 100644 --- a/README.md +++ b/README.md @@ -47,33 +47,17 @@ You're going to need: 1. Fork this repository on Github. 2. Clone *your forked repository* (not our original one) to your hard drive with `git clone https://github.com/YOURUSERNAME/slate.git` 3. `cd slate` -4. Initialize and start (there are a few options for this): +4. Initialize and start Slate. You can either do this locally, or with Vagrant: -#### Manual/local +#### Locally ```shell bundle install bundle exec middleman server ``` -#### Via Docker (must install it first) - -```shell -docker-compose up -``` - -will spin an environment for you, with the `source` directory mapped to the -container, so you can see your edits instantly after refreshing your browser. - You can now see the docs at http://localhost:4567. Whoa! That was fast! -+*Note: if you're not using Docker natively (i.e. on Linux), the docs will be -+available at the IP of your docker host. If you're using docker-machine you can -+retrieve it with `docker-machine ip `* - -*Note: if you're using the Docker setup on OSX, the docs will be -available at the output of `docker-machine ip ` (port: 4567) instead of `localhost:4567`.* - #### Via Vagrant ```shell vagrant up diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 7eeae41..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -app: - build: . - ports: - - 4567:4567 - volumes: - - ./source:/usr/src/app/source