Skip to content

Commit 8931aa6

Browse files
authored
Fix deps issues (#39)
* added dockerfile * update gemfile * update readme
1 parent de954e4 commit 8931aa6

File tree

5 files changed

+133
-41
lines changed

5 files changed

+133
-41
lines changed

Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ruby:3.2
2+
3+
# Install system dependencies
4+
RUN apt-get update && apt-get install -y \
5+
build-essential \
6+
git \
7+
nodejs \
8+
&& rm -rf /var/lib/apt/lists/*
9+
10+
# Set working directory
11+
WORKDIR /srv/jekyll
12+
13+
# Install bundler
14+
RUN gem install bundler
15+
16+
# Install GitHub Pages gem and dependencies
17+
COPY Gemfile Gemfile.lock ./
18+
RUN bundle install
19+
20+
# Copy your site content
21+
COPY . .
22+
23+
# Expose Jekyll server on all interfaces
24+
CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0", "--watch", "--force_polling"]

Gemfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ source 'https://rubygems.org'
33
# Minima is a default theme for Jekyll sites.
44
gem "minima"
55

6+
# Restrict to deps allowed on github-pages
7+
# gem "github-pages", group: :jekyll_plugins
8+
9+
# Needs webrick for local web service
10+
gem "webrick", "~> 1.8"
11+
612
group :development do
713
gem 'jekyll', '~> 4.1.0'
814
# gem 'jekyll-sitemap'

Gemfile.lock

Lines changed: 71 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,49 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.7.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
Ascii85 (2.0.1)
5+
addressable (2.8.7)
6+
public_suffix (>= 2.0.2, < 7.0)
7+
afm (0.2.2)
8+
async (2.24.0)
9+
console (~> 1.29)
10+
fiber-annotation
11+
io-event (~> 1.9)
12+
metrics (~> 0.12)
13+
traces (~> 0.15)
14+
bigdecimal (3.2.1)
615
colorator (1.1.0)
7-
concurrent-ruby (1.1.7)
8-
em-websocket (0.5.2)
16+
concurrent-ruby (1.3.5)
17+
console (1.30.2)
18+
fiber-annotation
19+
fiber-local (~> 1.1)
20+
json
21+
em-websocket (0.5.3)
922
eventmachine (>= 0.12.9)
10-
http_parser.rb (~> 0.6.0)
11-
ethon (0.12.0)
12-
ffi (>= 1.3.0)
23+
http_parser.rb (~> 0)
24+
ethon (0.16.0)
25+
ffi (>= 1.15.0)
1326
eventmachine (1.2.7)
14-
ffi (1.13.1)
27+
ffi (1.17.2-x86_64-linux-gnu)
28+
fiber-annotation (0.2.0)
29+
fiber-local (1.1.0)
30+
fiber-storage
31+
fiber-storage (1.0.1)
1532
forwardable-extended (2.6.0)
16-
html-proofer (3.16.0)
33+
hashery (2.1.2)
34+
html-proofer (5.0.10)
1735
addressable (~> 2.3)
18-
mercenary (~> 0.3)
19-
nokogumbo (~> 2.0)
20-
parallel (~> 1.3)
36+
async (~> 2.1)
37+
nokogiri (~> 1.13)
38+
pdf-reader (~> 2.11)
2139
rainbow (~> 3.0)
2240
typhoeus (~> 1.3)
2341
yell (~> 2.0)
24-
http_parser.rb (0.6.0)
25-
i18n (1.8.5)
42+
zeitwerk (~> 2.5)
43+
http_parser.rb (0.8.0)
44+
i18n (1.14.7)
2645
concurrent-ruby (~> 1.0)
46+
io-event (1.10.1)
2747
jekyll (4.1.1)
2848
addressable (~> 2.4)
2949
colorator (~> 1.0)
@@ -39,61 +59,73 @@ GEM
3959
rouge (~> 3.0)
4060
safe_yaml (~> 1.0)
4161
terminal-table (~> 1.8)
42-
jekyll-feed (0.15.1)
62+
jekyll-feed (0.17.0)
4363
jekyll (>= 3.7, < 5.0)
44-
jekyll-sass-converter (2.1.0)
64+
jekyll-sass-converter (2.2.0)
4565
sassc (> 2.0.1, < 3.0)
46-
jekyll-seo-tag (2.7.1)
66+
jekyll-seo-tag (2.8.0)
4767
jekyll (>= 3.8, < 5.0)
4868
jekyll-watch (2.2.1)
4969
listen (~> 3.0)
50-
kramdown (2.3.0)
51-
rexml
70+
json (2.12.2)
71+
kramdown (2.5.1)
72+
rexml (>= 3.3.9)
5273
kramdown-parser-gfm (1.1.0)
5374
kramdown (~> 2.0)
54-
liquid (4.0.3)
55-
listen (3.2.1)
75+
liquid (4.0.4)
76+
listen (3.9.0)
5677
rb-fsevent (~> 0.10, >= 0.10.3)
5778
rb-inotify (~> 0.9, >= 0.9.10)
5879
mercenary (0.4.0)
59-
mini_portile2 (2.4.0)
60-
minima (2.5.1)
80+
metrics (0.12.2)
81+
minima (2.5.2)
6182
jekyll (>= 3.5, < 5.0)
6283
jekyll-feed (~> 0.9)
6384
jekyll-seo-tag (~> 2.1)
64-
nokogiri (1.10.10)
65-
mini_portile2 (~> 2.4.0)
66-
nokogumbo (2.0.2)
67-
nokogiri (~> 1.8, >= 1.8.4)
68-
parallel (1.19.2)
85+
nokogiri (1.18.8-x86_64-linux-gnu)
86+
racc (~> 1.4)
6987
pathutil (0.16.2)
7088
forwardable-extended (~> 2.6)
71-
public_suffix (4.0.6)
72-
rainbow (3.0.0)
73-
rake (13.0.1)
74-
rb-fsevent (0.10.4)
75-
rb-inotify (0.10.1)
89+
pdf-reader (2.14.1)
90+
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
91+
afm (~> 0.2.1)
92+
hashery (~> 2.0)
93+
ruby-rc4
94+
ttfunk
95+
public_suffix (6.0.2)
96+
racc (1.8.1)
97+
rainbow (3.1.1)
98+
rake (13.3.0)
99+
rb-fsevent (0.11.2)
100+
rb-inotify (0.11.1)
76101
ffi (~> 1.0)
77-
rexml (3.2.4)
78-
rouge (3.24.0)
102+
rexml (3.4.1)
103+
rouge (3.30.0)
104+
ruby-rc4 (0.1.5)
79105
safe_yaml (1.0.5)
80106
sassc (2.4.0)
81107
ffi (~> 1.9)
82108
terminal-table (1.8.0)
83109
unicode-display_width (~> 1.1, >= 1.1.1)
84-
typhoeus (1.4.0)
110+
traces (0.15.2)
111+
ttfunk (1.8.0)
112+
bigdecimal (~> 3.1)
113+
typhoeus (1.4.1)
85114
ethon (>= 0.9.0)
86-
unicode-display_width (1.7.0)
115+
unicode-display_width (1.8.0)
116+
webrick (1.9.1)
87117
yell (2.2.2)
118+
zeitwerk (2.7.3)
88119

89120
PLATFORMS
90-
ruby
121+
x86_64-linux
91122

92123
DEPENDENCIES
93124
html-proofer
94125
jekyll (~> 4.1.0)
95126
minima
96127
rake
128+
webrick (~> 1.8)
97129

98130
BUNDLED WITH
99-
2.1.4
131+
2.6.9

README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Contributions are welcome. Feel free to open a pull request with changes.
1010

11-
### Running it Locally
11+
## Running it Locally
1212

1313
It can be helpful to preview changes on your computer before opening a pull request. *ROOCS website* uses the [Jekyll static site generator](http://jekyllrb.com/). After forking or cloning the repository, perform the following steps to generate the site and preview it:
1414

@@ -17,9 +17,28 @@ It can be helpful to preview changes on your computer before opening a pull requ
1717
- `bundle exec jekyll serve`
1818
- Point your browser at http://127.0.0.1:4000/
1919

20+
### Use Docker as build environment
21+
22+
Run this once to generate Gemfile.lock:
23+
```
24+
docker-compose run jekyll bundle install
25+
```
26+
27+
Build image:
28+
```
29+
docker-compose build
30+
```
31+
32+
Start service:
33+
```
34+
docker-compose up
35+
```
36+
37+
Open http://localhost:4000
38+
2039
## Deployment
2140

22-
Pull requests merged to the master branch are automatically deployed to the production website.
41+
Pull requests merged to the main branch are automatically deployed to the production website.
2342

2443
## License
2544

docker-compose.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: "3.8"
2+
3+
services:
4+
jekyll:
5+
build: .
6+
ports:
7+
- "4000:4000"
8+
volumes:
9+
- .:/srv/jekyll
10+
environment:
11+
- JEKYLL_ENV=development

0 commit comments

Comments
 (0)