Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit 2c62a85

Browse files
author
Vishal Lal
committed
Switch to gh-pages gem
1 parent 8a4dc12 commit 2c62a85

File tree

6 files changed

+164
-26
lines changed

6 files changed

+164
-26
lines changed

‎Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM ruby:2.3-alpine
2+
3+
COPY Gemfile .
4+
COPY Gemfile.lock .
5+
6+
RUN apk update && \
7+
apk add make gcc musl-dev nodejs python git
8+
RUN bundle install
9+
10+
WORKDIR /srv/jekyll
11+
EXPOSE 4000
12+
ENTRYPOINT ["jekyll", "serve", "--host", "0.0.0.0", "--watch", "--incremental"]

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "https://rubygems.org"
22
ruby RUBY_VERSION
3-
gem "jekyll", "3.3.0"
3+
gem "github-pages", '109', group: :jekyll_plugins

‎Gemfile.lock

Lines changed: 132 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.4.0)
4+
activesupport (4.2.7)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
addressable (2.5.0)
11+
public_suffix (~> 2.0, >= 2.0.2)
12+
coffee-script (2.4.1)
13+
coffee-script-source
14+
execjs
15+
coffee-script-source (1.12.2)
516
colorator (1.1.0)
17+
ethon (0.10.1)
18+
ffi (>= 1.3.0)
19+
execjs (2.7.0)
20+
faraday (0.10.1)
21+
multipart-post (>= 1.2, < 3)
622
ffi (1.9.14)
723
forwardable-extended (2.6.0)
8-
jekyll (3.3.0)
24+
gemoji (2.1.0)
25+
github-pages (109)
26+
activesupport (= 4.2.7)
27+
github-pages-health-check (= 1.3.0)
28+
jekyll (= 3.3.1)
29+
jekyll-avatar (= 0.4.2)
30+
jekyll-coffeescript (= 1.0.1)
31+
jekyll-default-layout (= 0.1.4)
32+
jekyll-feed (= 0.8.0)
33+
jekyll-gist (= 1.4.0)
34+
jekyll-github-metadata (= 2.2.0)
35+
jekyll-mentions (= 1.2.0)
36+
jekyll-optional-front-matter (= 0.1.2)
37+
jekyll-paginate (= 1.1.0)
38+
jekyll-readme-index (= 0.0.3)
39+
jekyll-redirect-from (= 0.11.0)
40+
jekyll-relative-links (= 0.2.1)
41+
jekyll-sass-converter (= 1.3.0)
42+
jekyll-seo-tag (= 2.1.0)
43+
jekyll-sitemap (= 0.12.0)
44+
jekyll-swiss (= 0.4.0)
45+
jekyll-theme-primer (= 0.1.1)
46+
jekyll-titles-from-headings (= 0.1.2)
47+
jemoji (= 0.7.0)
48+
kramdown (= 1.11.1)
49+
liquid (= 3.0.6)
50+
listen (= 3.0.6)
51+
mercenary (~> 0.3)
52+
minima (= 2.0.0)
53+
rouge (= 1.11.1)
54+
terminal-table (~> 1.4)
55+
github-pages-health-check (1.3.0)
56+
addressable (~> 2.3)
57+
net-dns (~> 0.8)
58+
octokit (~> 4.0)
59+
public_suffix (~> 2.0)
60+
typhoeus (~> 0.7)
61+
html-pipeline (2.4.2)
62+
activesupport (>= 2)
63+
nokogiri (>= 1.4)
64+
i18n (0.7.0)
65+
jekyll (3.3.1)
966
addressable (~> 2.4)
1067
colorator (~> 1.0)
1168
jekyll-sass-converter (~> 1.0)
@@ -16,33 +73,95 @@ GEM
1673
pathutil (~> 0.9)
1774
rouge (~> 1.7)
1875
safe_yaml (~> 1.0)
19-
jekyll-sass-converter (1.4.0)
20-
sass (~> 3.4)
76+
jekyll-avatar (0.4.2)
77+
jekyll (~> 3.0)
78+
jekyll-coffeescript (1.0.1)
79+
coffee-script (~> 2.2)
80+
jekyll-default-layout (0.1.4)
81+
jekyll (~> 3.0)
82+
jekyll-feed (0.8.0)
83+
jekyll (~> 3.3)
84+
jekyll-gist (1.4.0)
85+
octokit (~> 4.2)
86+
jekyll-github-metadata (2.2.0)
87+
jekyll (~> 3.1)
88+
octokit (~> 4.0, != 4.4.0)
89+
jekyll-mentions (1.2.0)
90+
activesupport (~> 4.0)
91+
html-pipeline (~> 2.3)
92+
jekyll (~> 3.0)
93+
jekyll-optional-front-matter (0.1.2)
94+
jekyll (~> 3.0)
95+
jekyll-paginate (1.1.0)
96+
jekyll-readme-index (0.0.3)
97+
jekyll (~> 3.0)
98+
jekyll-redirect-from (0.11.0)
99+
jekyll (>= 2.0)
100+
jekyll-relative-links (0.2.1)
101+
jekyll (~> 3.3)
102+
jekyll-sass-converter (1.3.0)
103+
sass (~> 3.2)
104+
jekyll-seo-tag (2.1.0)
105+
jekyll (~> 3.3)
106+
jekyll-sitemap (0.12.0)
107+
jekyll (~> 3.3)
108+
jekyll-swiss (0.4.0)
109+
jekyll-theme-primer (0.1.1)
110+
jekyll (~> 3.3)
111+
jekyll-titles-from-headings (0.1.2)
112+
jekyll (~> 3.3)
21113
jekyll-watch (1.5.0)
22114
listen (~> 3.0, < 3.1)
23-
kramdown (1.12.0)
115+
jemoji (0.7.0)
116+
activesupport (~> 4.0)
117+
gemoji (~> 2.0)
118+
html-pipeline (~> 2.2)
119+
jekyll (>= 3.0)
120+
json (1.8.3)
121+
kramdown (1.11.1)
24122
liquid (3.0.6)
25-
listen (3.0.8)
26-
rb-fsevent (~> 0.9, >= 0.9.4)
27-
rb-inotify (~> 0.9, >= 0.9.7)
123+
listen (3.0.6)
124+
rb-fsevent (>= 0.9.3)
125+
rb-inotify (>= 0.9.7)
28126
mercenary (0.3.6)
127+
mini_portile2 (2.1.0)
128+
minima (2.0.0)
129+
minitest (5.10.1)
130+
multipart-post (2.0.0)
131+
net-dns (0.8.0)
132+
nokogiri (1.7.0.1)
133+
mini_portile2 (~> 2.1.0)
134+
octokit (4.6.2)
135+
sawyer (~> 0.8.0, >= 0.5.3)
29136
pathutil (0.14.0)
30137
forwardable-extended (~> 2.6)
31-
rb-fsevent (0.9.7)
138+
public_suffix (2.0.5)
139+
rb-fsevent (0.9.8)
32140
rb-inotify (0.9.7)
33141
ffi (>= 0.5.0)
34142
rouge (1.11.1)
35143
safe_yaml (1.0.4)
36-
sass (3.4.22)
144+
sass (3.4.23)
145+
sawyer (0.8.1)
146+
addressable (>= 2.3.5, < 2.6)
147+
faraday (~> 0.8, < 1.0)
148+
terminal-table (1.7.3)
149+
unicode-display_width (~> 1.1.1)
150+
thread_safe (0.3.5)
151+
typhoeus (0.8.0)
152+
ethon (>= 0.8.0)
153+
tzinfo (1.2.2)
154+
thread_safe (~> 0.1)
155+
unicode-display_width (1.1.2)
37156

38157
PLATFORMS
39158
ruby
40159

41160
DEPENDENCIES
42-
jekyll (= 3.3.0)
161+
github-pages (= 109)
43162

44163
RUBY VERSION
45-
ruby 2.3.1p112
164+
ruby 2.3.3p222
46165

47166
BUNDLED WITH
48-
1.13.5
167+
1.13.7

‎_includes/header.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<div class="header-home"><a href="{{site.main_url_prefix}}/">Socks Shop</a></div>
33
<nav>
44
<ul class="nav header-nav">
5-
<li class="{% if include.quickstart %}active{% endif %}"><a href="{{site.main_url_prefix}}/docs/quickstart.html">Quickstart</a></li>
6-
<li class="{% if include.docs %}active{% endif %}"><a href="{{site.main_url_prefix}}/docs/index.html">Docs</a></li>
7-
<li class="{% if include.api %}active{% endif %}"><a href="{{site.main_url_prefix}}/api/index.html">API</a></li>
5+
<li class="{% if include.quickstart %}active{% endif %}"><a href="/docs/quickstart.html">Quickstart</a></li>
6+
<li class="{% if include.docs %}active{% endif %}"><a href="/docs/index.html">Docs</a></li>
7+
<li class="{% if include.api %}active{% endif %}"><a href="/api/index.html">API</a></li>
88
<li><a href="http://github.com/microservices-demo" target="_blank">GitHub</a></li>
99
</ul>
1010
</nav>

‎docker-compose.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
version: '2'
2+
3+
services:
4+
jekyll:
5+
build:
6+
context: .
7+
image: weaveworksdemos/ms-docs
8+
command: jekyll serve --host 0.0.0.0 --watch --incremental
9+
environment:
10+
- JEKYLL_ENV=development
11+
- PAGES_REPO_NWO=microservices-demo/microservices-demo
12+
ports:
13+
- 4000:4000
14+
volumes:
15+
- .:/srv/jekyll
16+
- $PWD/_config.yml.dev:/srv/jekyll/_config.yml

‎local-server.sh

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)