Skip to content
This repository was archived by the owner on May 26, 2019. It is now read-only.

Commit 43573be

Browse files
NullVoxPopuliacorncom
authored andcommitted
Use Public Website Docker Image (#2087)
* use public docker image * manually specify deps installation to not confuse between projects * update readme * Updated link and removed extraneous Docker info
1 parent cb94fc6 commit 43573be

File tree

3 files changed

+8
-38
lines changed

3 files changed

+8
-38
lines changed

Dockerfile

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,9 @@
1-
FROM ruby:2.3
1+
FROM dockerizedember/website-dev:latest
22

3-
USER root
4-
5-
ENV BUNDLER_VERSION 1.15.1
6-
7-
# en - English
8-
# pt - Portuguese and Brazilian Portuguese
9-
# es - Spanish
10-
# pl - Polish
11-
ENV ASPELL_LANGUAGES aspell-en aspell-pt aspell-es aspell-pl
12-
13-
# JavaScript runtime required by execjs gem
14-
# Spellchecking
15-
ENV PACKAGES nodejs aspell $ASPELL_LANGUAGES
16-
17-
RUN apt-get update && apt-get -y install $PACKAGES
18-
19-
# Fix the Bundler version
20-
RUN gem install bundler -v $BUNDLER_VERSION
21-
RUN mkdir /guides
22-
23-
WORKDIR /guides
24-
25-
ADD Gemfile /guides/Gemfile
26-
ADD Gemfile.lock /guides/Gemfile.lock
3+
# Customizations for this project here.
4+
# e.g.: if you have dependencies in addition to what the base image provides:
5+
ADD Gemfile /src/Gemfile
6+
ADD Gemfile.lock /src/Gemfile.lock
277
RUN bundle install
288

29-
ADD . /guides
30-
31-
CMD bundle exec middleman
9+
ADD . /src

README.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Although the Guides are built with Ruby, most work is done in Markdown files.
3030
You don't need to know Ruby or install its dependencies to help out. Simply follow
3131
the Docker container instructions below to install and run locally.
3232

33-
First, install [Docker](https://www.docker.com/) and leave it running.
33+
First, install [Docker and Compose](https://store.docker.com/search?offering=community&type=edition) and leave it running.
3434

3535
Next, the commands below will install all necessary dependencies for the Guides
3636
app and start a server. This will take a little while to run,
@@ -86,14 +86,6 @@ bundle
8686
bundle exec middleman
8787
```
8888

89-
#### With Docker
90-
```sh
91-
git clone git://github.com/emberjs/guides.git
92-
cd guides
93-
docker-compose build
94-
docker-compose up
95-
```
96-
9789
#### Viewing
9890

9991
Then visit [http://localhost:4567/](http://localhost:4567/).

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ services:
88
ports:
99
- "4567:4567"
1010
volumes:
11-
- .:/guides
11+
- .:/src

0 commit comments

Comments
 (0)