railsbridge · Feb 11, 2018 · Feb 11, 2018 · Feb 12, 2018 · Feb 12, 2018 · Feb 12, 2018
diff --git a/public/img/docker.png b/public/img/docker.png
diff --git a/sites/en/installfest/_docker-glossary.md b/sites/en/installfest/_docker-glossary.md
@@ -0,0 +1,19 @@
+**docker-compose run web <<commands>>** will runs given commands in web service container.
+
+**docker-compose run web rails c** will run rails console in web service container.
+
+**docker-compose run web bash** runs bash to interact with the directory inside
+the web service container. You can also use this to run Rails commands such as `rails console` too.
+
+**docker-compose build** will build an image when `Dockerfile` changes or when you want to update or add gems.
+
+**docker-compose up** starts up the containers.
+
+**docker-compose up -d** starts up the containers **in the background**.
+
+**docker-compose down** stops containers. If you have a Rails server running, this is how you stop it.
+
+**docker-compose ps** lists container processes, container name, container id.
+
+**docker attach <<contianer_name>>** attaches to the named container to interact
+with `binding.pry`. `Control + p`, `Control + q`, detach from container.
diff --git a/sites/en/installfest/choose_your_operating_system.step b/sites/en/installfest/choose_your_operating_system.step
@@ -18,3 +18,12 @@ div(class: "os-button") do
     h3 "Linux"
   end
 end
+
+h2 "Or install Docker"
+
+div(class: "os-button") do
+  simple_link "docker" do
+    img src: "/img/docker.png"
+    h3 "Docker"
+  end
+end
diff --git a/sites/en/installfest/clean_up.step b/sites/en/installfest/clean_up.step
@@ -20,3 +20,7 @@ step "Delete the test_app from your computer" do
     console "rm -rf ~/railsbridge/test_app"
   end
 end
+
+step "Delete the test_app Docker image from your computer" do
+  console "docker rmi test_app_web"
+end
diff --git a/sites/en/installfest/create_a_rails_app.step b/sites/en/installfest/create_a_rails_app.step
@@ -1,3 +1,7 @@
+tip do
+  message "**WAIT! If you are using Docker, SKIP this page and go to [Create a Rails App with Docker] (create_a_rails_app_with_docker)**"
+end
+
 tip do
   console_with_message "From here on, this guide assumes you have Rails 5.0.x. To check your Rails version, type this in the terminal:", "rails -v"
   fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
@@ -102,4 +106,3 @@ step "Generate a database model" do
 end
 
 next_step "deploy_a_rails_app"
-
diff --git a/sites/en/installfest/create_a_rails_app_with_docker.step b/sites/en/installfest/create_a_rails_app_with_docker.step
@@ -0,0 +1,155 @@
+step "Change to your home directory" do
+  insert 'switch_to_home_directory'
+end
+
+step "Create a railsbridge directory" do
+  console "mkdir railsbridge"
+  message "`mkdir` stands for make directory (folder)."
+  message "We've made a folder called `railsbridge`."
+end
+
+step "Change to your new railsbridge directory" do
+  console "cd railsbridge"
+end
+
+step "Create a new Rails app" do
+  console "mkdir test_app"
+  console "cd test_app"
+
+  message "In your editor, create a new file called `Gemfile`"
+  message "Copy the following into `Gemfile`:"
+  source_code :ruby, <<-CONTENTS
+    source "https://rubygems.org"
+    gem "rails", "5.2.0"
+  CONTENTS
+  console "touch Gemfile.lock"
+
+  message "In your editor, create a new file called `Dockerfile`:"
+  message "Copy the following into `Dockerfile`:"
+  source_code :text, <<-CONTENTS
+    FROM ruby:2.5.1-slim
+
+    RUN apt-get update -qq && apt-get install -y build-essential libpq-dev git vim nodejs postgresql-client build-essential
+
+    ENV APP_HOME /test_app
+    RUN mkdir -p $APP_HOME
+    WORKDIR $APP_HOME
+    COPY Gemfile* $APP_HOME/
+    RUN bundle install
+    COPY . $APP_HOME
+  CONTENTS
+
+  message "In your editor, create a new file called `docker-compose.yml`:"
+  message "Copy the following into `docker-compose.yml`:"
+  source_code :text, <<-CONTENTS
+    version: '3'
+    services:
+      db:
+        image: postgres:10.3
+        volumes:
+          - db_data:/var/lib/postgresql/data
+      web:
+        build: .
+        environment:
+          DATABASE_URL: db
+        tty: true
+        stdin_open: true
+        volumes:
+          - .:/test_app
+        command: bash -c 'rm -rf /test_app/tmp/pids/server.pid && bin/rails s -p 3000 -b 0.0.0.0'
+        ports:
+          - "3000:3000"
+        depends_on:
+          - db
+    volumes:
+      db_data:
+        driver: local
+  CONTENTS
+
+  message "In your editor, create a new file called `.dockerignore`:"
+  message "Copy the following into `.dockerignore`:"
+  source_code :text, <<-CONTENTS
+    .git
+    .dockerignore
+    .byebug_history
+    log/*
+    tmp/*
+    Dockerfile
+    README.md
+  CONTENTS
+
+  message "Build your rails app:"
+  console "docker-compose run web rails new . --force --database=postgresql"
+  console "docker-compose build"
+
+  message "Setup the database:"
+  message "In your editor, open up `config/database.yml` and change it to the following:"
+  source_code :ruby, <<-CONTENTS
+    default: &default
+      adapter: postgresql
+      encoding: unicode
+      username: postgres
+      password:
+      pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+      host: <%= ENV.fetch("DATABASE_URL") %>
+    development:
+      <<: *default
+      database: test_app_development
+    test:
+      <<: *default
+      database: test_app_test
+    production:
+      <<: *default
+      database: test_app_production
+      password: <%= ENV['APP_DATABASE_PASSWORD'] %>
+  CONTENTS
+  console "docker-compose run web rails db:create"
+  console "docker-compose run web rails db:migrate"
+
+  console "docker-compose up"
+  tip "`docker-compose up` will execute the command, `bin/rails s -p 3000 -b '0.0.0.0'`, in `docker-compose.yml`"
+
+  message "In your browser, go to <http://localhost:3000>"
+  img src: "img/successful_rails_install.png", alt: "Screenshot of the browser on localhost 3000 showing the rails intro page"
+
+  message "Open a new terminal tab, and stop the server."
+  console "docker-compose down"
+end
+
+step "Generate a database model" do
+  tip "If your prompt doesn't already show that you are (still) in the test_app folder" do
+    console "cd test_app"
+  end
+
+  message "Run the following in terminal:"
+  console "docker-compose run web bash"
+
+  console <<-BASH
+    rails generate scaffold drink name:string temperature:integer
+  BASH
+
+  console <<-BASH
+    rails db:migrate
+  BASH
+
+  message "Open another tab in terminal to bring the rails server up in Docker with:"
+  console <<-BASH
+    docker-compose up
+  BASH
+
+  message <<-MARKDOWN
+    In the browser, visit <http://localhost:3000/drinks>
+
+    1. Click on "New drink"
+    2. Enter Cappuccino for the name
+    3. Enter 135 for the temperature.
+    4. Click on "Create Drink".
+
+    You should see: ![Screenshot of the drink detail page](img/get_a_sticker_you_should_see.png)
+
+  MARKDOWN
+  message "Open a new terminal tab, and stop the server."
+  console "docker-compose down"
+end
+
+next_step "deploy_a_rails_app"
diff --git a/sites/en/installfest/deploy_a_rails_app.step b/sites/en/installfest/deploy_a_rails_app.step
@@ -55,6 +55,10 @@ step "Deploy your app to Heroku" do
   end
 
   step "Prepare your rails app for deploying to Heroku" do
+    tip do
+      message "**WAIT!  If you are using Docker, SKIP this step and proceed to Step 2.3**"
+    end
+
     message <<-MARKDOWN
       Launch your text editor and open the "Gemfile" file located inside of your test_app folder. (On Windows, this should be in `C:\\Sites\\railsbridge\\test_app` and on Linux/OS X, it should be under `~/railsbridge/test_app`.)
 

diff --git a/sites/en/installfest/docker.step b/sites/en/installfest/docker.step
@@ -0,0 +1,38 @@
+step "Install Docker" do
+  option "Docker for Mac" do
+    message "Visit [Docker for Mac download page](https://store.docker.com/editions/community/docker-ce-desktop-mac)"
+    message "Download and install the **Stable** verion"
+  end
+
+  option "Docker for Windows" do
+    message "Visit [Docker for Windows download page](https://store.docker.com/editions/community/docker-ce-desktop-windows)"
+    message "Download and install the **Stable** version"
+  end
+
+  option "Docker for Ubuntu" do
+    message "Visit [Docker for Ubuntu download page](https://store.docker.com/editions/community/docker-ce-server-ubuntu)"
+    message "Download and install the **Stable** version"
+  end
+
+  option "Docker for other platforms" do
+    message "Visit the [Docker Community Edition Downloads Page](https://www.docker.com/community-edition)"
+  end
+end
+
+step "Install Git" do
+  option "Macintosh" do
+    message "Follow Step 1 through Step 4 in OSX Rvm"
+    link "osx_rvm"
+  end
+
+  option "Windows" do
+    message "Go to <http://git-scm.com> and download and run the installer."
+  end
+
+  option "Ubuntu" do
+    message "Open a terminal (Applications > Accessories > Terminal)."
+    console "sudo apt-get install git"
+  end
+end
+
+next_step "configure_git"
diff --git a/sites/en/installfest/get_a_sticker.step b/sites/en/installfest/get_a_sticker.step
@@ -4,27 +4,37 @@ step "Have a volunteer check your tool versions" do
 
   verify "tool installation" do
 
-    tip "Most of the time, the version numbers don't have to match exactly. In general, if the *first two* numbers match, or if the full number you have is *greater* than the one below, then you're cool."
+    option_half "Without Docker" do
+      tip "Most of the time, the version numbers don't have to match exactly. In general, if the *first two* numbers match, or if the full number you have is *greater* than the one below, then you're cool."
 
-    h3 "If you're on OSX or Linux:"
+      h3 "If you're on OSX or Linux:"
 
-    console "rvm -v"
-    fuzzy_result "rvm 1{FUZZY}.x.x by Wayne E. Seguin (wayneeseguin@gmail.com) [https://rvm.io/]{/FUZZY}"
+      console "rvm -v"
+      fuzzy_result "rvm 1{FUZZY}.x.x by Wayne E. Seguin (wayneeseguin@gmail.com) [https://rvm.io/]{/FUZZY}"
 
-    h3 "On all operating systems:"
+      h3 "On all operating systems:"
 
-    console "ruby -v"
-    fuzzy_result "ruby 2.3{FUZZY}.3p222 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
+      console "ruby -v"
+      fuzzy_result "ruby 2.3{FUZZY}.3p222 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
 
-    tip "As long as your Ruby version is #{version_string(:ruby_short)} or above, you're good to go."
+      tip "As long as your Ruby version is #{version_string(:ruby_short)} or above, you're good to go."
 
-    console "bundle -v"
-    fuzzy_result "Bundler version 1{FUZZY}.x.x{/FUZZY}"
+      console "bundle -v"
+      fuzzy_result "Bundler version 1{FUZZY}.x.x{/FUZZY}"
 
-    console "rails -v"
-    fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
+      console "rails -v"
+      fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
 
-    tip 'The RailsBridge curriculum is written for Rails 5, so if you still have Rails 4.x or earlier, you need to install Rails 5 with `gem install rails`.'
+      tip 'The RailsBridge curriculum is written for Rails 5, so if you still have Rails 4.x or earlier, you need to install Rails 5 with `gem install rails`.'
+    end
+
+    option_half "With Docker" do
+      message "The following should output `ruby` version `2.5.1-slim` and `postgres` version `10.3`:"
+      console "docker images"
+
+      console "docker-compose run web rails -v"
+      fuzzy_result "Rails 5.2.0"
+    end
   end
 end
 

diff --git a/sites/en/installfest/glossary.step b/sites/en/installfest/glossary.step
@@ -4,8 +4,10 @@ span "Have a look at the "
 a 'general Glossary', href: '#general-glossary'
 span ", the "
 a 'Command Line Glossary', href: '#command-line-glossary'
-span ", and the "
+span ", the "
 a 'Ruby and Rails Glossary', href: '#ruby-and-rails-glossary'
+span ", and the "
+a 'Docker Glossary', href: '#docker-glossary'
 span "."
 
 a name: 'general-glossary'
@@ -22,3 +24,8 @@ a name: 'ruby-and-rails-glossary'
 situation "Ruby and Rails Glossary" do
   insert 'ruby-and-rails-glossary'
 end
+
+a name: 'docker-glossary'
+situation "Docker Glossary" do
+  insert 'docker-glossary'
+end