Skip to content

Commit f24fd71

Browse files
committed
Fixed spelling errors, etc.
1 parent dc57cd6 commit f24fd71

File tree

8 files changed

+57
-139
lines changed

8 files changed

+57
-139
lines changed

.bundle/config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
BUNDLE_DISABLE_SHARED_GEMS: '1'
2+
BUNDLE_BUILD__NOKOGIRI: "--use-system-libraries"

Dockerfile

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
FROM razic/bundler
1+
FROM iron/ruby:dev
22

3-
RUN mkdir -p /iron/docs
4-
ADD Gemfile /iron/docs/Gemfile
5-
WORKDIR /iron/docs
3+
RUN apk update && apk upgrade
4+
RUN apk add nodejs
5+
6+
WORKDIR /app
7+
ADD Gemfile* /app/
68
RUN bundle install
79

8-
ENTRYPOINT ["bundle"]
10+
# ADD . /worker/
11+
ENTRYPOINT ["jekyll"]

Gemfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'github-pages'
3+
gem 'jekyll'
44
gem "therubyracer"
5+
gem 'json', '1.8.3'
6+
gem 'nokogiri'

Gemfile.lock

+27-118
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
5-
activesupport (4.2.4)
6-
i18n (~> 0.7)
7-
json (~> 1.7, >= 1.7.7)
8-
minitest (~> 5.1)
9-
thread_safe (~> 0.3, >= 0.3.4)
10-
tzinfo (~> 1.1)
11-
addressable (2.3.8)
12-
blankslate (2.1.2.4)
13-
celluloid (0.16.0)
14-
timers (~> 4.0.0)
15-
classifier-reborn (2.0.3)
16-
fast-stemmer (~> 1.0)
17-
coffee-script (2.4.1)
18-
coffee-script-source
19-
execjs
20-
coffee-script-source (1.9.1.1)
214
colorator (0.1)
22-
ethon (0.7.4)
23-
ffi (>= 1.3.0)
24-
execjs (2.6.0)
25-
fast-stemmer (1.0.2)
265
ffi (1.9.10)
27-
gemoji (2.1.0)
28-
github-pages (39)
29-
RedCloth (= 4.2.9)
30-
github-pages-health-check (~> 0.2)
31-
jekyll (= 2.4.0)
32-
jekyll-coffeescript (= 1.0.1)
33-
jekyll-feed (= 0.3.1)
34-
jekyll-mentions (= 0.2.1)
35-
jekyll-redirect-from (= 0.8.0)
36-
jekyll-sass-converter (= 1.3.0)
37-
jekyll-sitemap (= 0.8.1)
38-
jemoji (= 0.5.0)
39-
kramdown (= 1.5.0)
40-
liquid (= 2.6.2)
41-
maruku (= 0.7.0)
42-
mercenary (~> 0.3)
43-
pygments.rb (= 0.6.3)
44-
rdiscount (= 2.1.7)
45-
redcarpet (= 3.3.2)
46-
terminal-table (~> 1.4)
47-
github-pages-health-check (0.5.3)
48-
addressable (~> 2.3)
49-
net-dns (~> 0.8)
50-
public_suffix (~> 1.4)
51-
typhoeus (~> 0.7)
52-
hitimes (1.2.2)
53-
html-pipeline (1.9.0)
54-
activesupport (>= 2)
55-
nokogiri (~> 1.4)
56-
i18n (0.7.0)
57-
jekyll (2.4.0)
58-
classifier-reborn (~> 2.0)
6+
jekyll (3.1.6)
597
colorator (~> 0.1)
60-
jekyll-coffeescript (~> 1.0)
61-
jekyll-gist (~> 1.0)
62-
jekyll-paginate (~> 1.0)
638
jekyll-sass-converter (~> 1.0)
649
jekyll-watch (~> 1.1)
6510
kramdown (~> 1.3)
66-
liquid (~> 2.6.1)
11+
liquid (~> 3.0)
6712
mercenary (~> 0.3.3)
68-
pygments.rb (~> 0.6.0)
69-
redcarpet (~> 3.1)
13+
rouge (~> 1.7)
7014
safe_yaml (~> 1.0)
71-
toml (~> 0.1.0)
72-
jekyll-coffeescript (1.0.1)
73-
coffee-script (~> 2.2)
74-
jekyll-feed (0.3.1)
75-
jekyll-gist (1.3.4)
76-
jekyll-mentions (0.2.1)
77-
html-pipeline (~> 1.9.0)
78-
jekyll (~> 2.0)
79-
jekyll-paginate (1.1.0)
80-
jekyll-redirect-from (0.8.0)
81-
jekyll (>= 2.0)
82-
jekyll-sass-converter (1.3.0)
83-
sass (~> 3.2)
84-
jekyll-sitemap (0.8.1)
85-
jekyll-watch (1.2.1)
86-
listen (~> 2.7)
87-
jemoji (0.5.0)
88-
gemoji (~> 2.0)
89-
html-pipeline (~> 1.9)
90-
jekyll (>= 2.0)
15+
jekyll-sass-converter (1.4.0)
16+
sass (~> 3.4)
17+
jekyll-watch (1.4.0)
18+
listen (~> 3.0, < 3.1)
9119
json (1.8.3)
92-
kramdown (1.5.0)
93-
libv8 (3.16.14.11)
94-
liquid (2.6.2)
95-
listen (2.10.1)
96-
celluloid (~> 0.16.0)
97-
rb-fsevent (>= 0.9.3)
98-
rb-inotify (>= 0.9)
99-
maruku (0.7.0)
100-
mercenary (0.3.5)
101-
mini_portile (0.6.2)
102-
minitest (5.8.0)
103-
net-dns (0.8.0)
104-
nokogiri (1.6.6.2)
105-
mini_portile (~> 0.6.0)
106-
parslet (1.5.0)
107-
blankslate (~> 2.0)
108-
posix-spawn (0.3.11)
109-
public_suffix (1.5.1)
110-
pygments.rb (0.6.3)
111-
posix-spawn (~> 0.3.6)
112-
yajl-ruby (~> 1.2.0)
113-
rb-fsevent (0.9.6)
114-
rb-inotify (0.9.5)
20+
kramdown (1.11.1)
21+
libv8 (3.16.14.15)
22+
liquid (3.0.6)
23+
listen (3.0.8)
24+
rb-fsevent (~> 0.9, >= 0.9.4)
25+
rb-inotify (~> 0.9, >= 0.9.7)
26+
mercenary (0.3.6)
27+
mini_portile2 (2.1.0)
28+
nokogiri (1.6.8)
29+
mini_portile2 (~> 2.1.0)
30+
pkg-config (~> 1.1.7)
31+
pkg-config (1.1.7)
32+
rb-fsevent (0.9.7)
33+
rb-inotify (0.9.7)
11534
ffi (>= 0.5.0)
116-
rdiscount (2.1.7)
117-
redcarpet (3.3.2)
11835
ref (2.0.0)
36+
rouge (1.11.1)
11937
safe_yaml (1.0.4)
120-
sass (3.4.18)
121-
terminal-table (1.5.2)
38+
sass (3.4.22)
12239
therubyracer (0.12.2)
12340
libv8 (~> 3.16.14.0)
12441
ref
125-
thread_safe (0.3.5)
126-
timers (4.0.4)
127-
hitimes
128-
toml (0.1.2)
129-
parslet (~> 1.5.0)
130-
typhoeus (0.7.3)
131-
ethon (>= 0.7.4)
132-
tzinfo (1.2.2)
133-
thread_safe (~> 0.1)
134-
yajl-ruby (1.2.1)
13542

13643
PLATFORMS
13744
ruby
13845

13946
DEPENDENCIES
140-
github-pages
47+
jekyll
48+
json (= 1.8.3)
49+
nokogiri
14150
therubyracer
14251

14352
BUNDLED WITH
144-
1.10.4
53+
1.10.5

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ Development
2727

2828
In the project directory, run `bundle exec jekyll serve --watch`. This will auto-reload as you make changes to files.
2929

30+
## Using Docker to avoid the pain of installing things like nokogiri
31+
32+
1. `docker build -t jekyll .`
33+
1. `docker run --rm -it -v "$PWD":/app -p 4000:4000 jekyll serve --watch --host 0.0.0.0`
34+
35+
Note: to do a bundle update, run `docker run --rm -it -v "$PWD":/app -w /app iron/ruby:dev bundle update`
36+
3037
Development using Cloud9 (http://c9.io)
3138
---------------------------------------
3239

_includes/configuration.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ IRON_PROJECT_ID=MY_PROJECT_ID
3535

3636
<h2 id="using_iron_json">Configuration using iron.json</h2>
3737

38-
You can follow the <a href="/worker/reference/configuration-iron-json/index.html">configuration scheme</a> and set project_id, token and other parameters in iron.json file but using only environment variables is more preferred.
38+
You can follow the <a href="/worker/reference/configuration-iron-json/index.html">configuration scheme</a> and set project_id, token and other parameters in iron.json file but using only environment variables is preferred.

_plugins/index_all_pages.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
require 'rubygems'
22
require 'json'
3+
require 'nokogiri'
4+
35

46
module Jekyll
57

@@ -97,7 +99,6 @@ def pages_to_index(site)
9799
end
98100
end
99101
end
100-
require 'nokogiri'
101102

102103
module Jekyll
103104

@@ -116,7 +117,6 @@ def render(item)
116117
end
117118

118119
end
119-
require 'nokogiri'
120120

121121
module Jekyll
122122

worker/trainingVideos/index.md

+8-11
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,16 @@ Whether you're just getting started using Docker or you're an old pro, we've put
1010
<h2 id='Prerequisites'>Prerequisites</h2>
1111

1212

13-
Before moving forward, pleae ensure you've:<br />
14-
[Install the CLI tool](/worker/cli/) <br />
15-
[Setup your Iron.io credentials](/worker/reference/configuration/)<br />
16-
[Install Docker](https://docs.docker.com/installation/#installation)<br />
17-
[Created a Docker Hub Account](https://hub.docker.com/)
13+
Before moving forward, please ensure you've:
1814

15+
* [Installed the CLI tool](/worker/cli/) <br />
16+
* [Setup your Iron.io credentials](/worker/reference/configuration/)<br />
17+
* [Installed Docker](https://docs.docker.com/installation/#installation)<br />
18+
* [Created a Docker Hub Account](https://hub.docker.com/)
1919

2020
<h2 id='vids'>Current Video Selections</h2>
2121

22-
2322
<ul>
24-
<li id='helloWorld'> <a href='https://iron-1.wistia.com/medias/1n9ra6grpz' target="_blank">Hello World</a></li>
25-
26-
<li id='custImg'><a href='https://iron-1.wistia.com/medias/em135thx45' target="_blank">Making Your First Custom Image</a></li>
27-
28-
23+
<li id='helloWorld'> <a href='https://iron-1.wistia.com/medias/1n9ra6grpz' target="_blank">Hello World</a></li>
24+
<li id='custImg'><a href='https://iron-1.wistia.com/medias/em135thx45' target="_blank">Making Your First Custom Image</a></li>
25+
</ul>

0 commit comments

Comments
 (0)