docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Rails 5, Ruby 2.3.3, remove therubyracer (#718) 

* Update to Rails 5, Ruby 2.3.3, remove therubyracer

Update packages to latest versions. The actual nodejs is installed on line 18. Changed to a general comment regarding the need to rebuild images when adding gems.

* update rails welcome screenshot to 5.0.0.1
This commit is contained in:
Adam Stevenson 2016-11-29 16:52:16 -05:00 committed by John Mulhausen
parent a086af7a8b
commit 53da48206b
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
compose/images/rails-welcome.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 242 KiB

11
compose/rails.md
View File

@ -14,7 +14,7 @@ dependencies, you'll need to define exactly what needs to be included in the
container. This is done using a file called `Dockerfile`. To begin with, the container. This is done using a file called `Dockerfile`. To begin with, the
Dockerfile consists of: Dockerfile consists of:
FROM ruby:2.2.0 FROM ruby:2.3.3
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
RUN mkdir /myapp RUN mkdir /myapp
WORKDIR /myapp WORKDIR /myapp
@ -30,7 +30,7 @@ how to write Dockerfiles, see the [Docker user guide](/engine/tutorials/dockerim
Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`. Next, create a bootstrap `Gemfile` which just loads Rails. It'll be overwritten in a moment by `rails new`.
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.2.0' gem 'rails', '5.0.0.1'
You'll need an empty `Gemfile.lock` in order to build our `Dockerfile`. You'll need an empty `Gemfile.lock` in order to build our `Dockerfile`.
@ -99,12 +99,7 @@ If you are running Docker on Mac or Windows, you should already have ownership
of all files, including those generated by `rails new`. List the files just to of all files, including those generated by `rails new`. List the files just to
verify this. verify this.
Uncomment the line in your new `Gemfile` which loads `therubyracer`, so you've If you edit `Gemfile` at this point or later, you will need to build the image again. (This,
got a Javascript runtime:
gem 'therubyracer', platforms: :ruby
Now that you've got a new `Gemfile`, you need to build the image again. (This,
and changes to the Dockerfile itself, should be the only times you'll need to and changes to the Dockerfile itself, should be the only times you'll need to
rebuild.) rebuild.)