Skip to content

Commit cbc604c

Browse files
aschemanascheman
committed
WIP Switch to Jekyll 4 and provide local Docker build
Fixing Gems by Gemfile.lock ensures comparable environments
1 parent 98c0372 commit cbc604c

File tree

7 files changed

+309
-14
lines changed

7 files changed

+309
-14
lines changed

‎.github/workflows/build+deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
# Step 2: Build the Jekyll site with Docker
1919
- name: Build website with Jekyll (Docker)
2020
run: |
21-
docker run --rm \
21+
docker compose run --rm \
2222
-v $(pwd):/srv/jekyll \
23-
jekyll/jekyll:3.8 \
23+
jekyll \
2424
jekyll build
2525
2626
# Step 3: Save `_site` directory as an artifact

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ _site
55
.jekyll-metadata
66
.bundle
77
.sass-cache
8-
Gemfile.lock
98
*.iml
109
_rebuild-page*
1110
_start_server*

‎Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Base image: Jekyll 3.8
2+
FROM jekyll/jekyll:4
3+
4+
# Set working directory
5+
WORKDIR /srv/jekyll
6+
7+
# Install dependencies
8+
#RUN apk --no-cache add build-base libffi-dev
9+
10+
# Copy Gemfile and Gemfile.lock into the container
11+
COPY Gemfile Gemfile.lock ./
12+
13+
# Install Ruby gems
14+
RUN bundle install
15+
16+
# Run Jekyll by default
17+
CMD ["jekyll", "serve", "--watch", "--incremental", "--host", "0.0.0.0"]
18+
19+
EXPOSE 4000

‎Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source 'https://rubygems.org'
2-
raise 'Ruby should be >=2.0' unless RUBY_VERSION.to_f >= 2.0
3-
gem 'github-pages'
4-
gem "webrick", "~> 1.7"
2+
raise 'Ruby should be >=3.0' unless RUBY_VERSION.to_f >= 3.0
3+
gem "github-pages", group: :jekyll_plugins
4+
gem "webrick"

‎Gemfile.lock

Lines changed: 280 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,280 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
activesupport (7.2.2.1)
5+
base64
6+
benchmark (>= 0.3)
7+
bigdecimal
8+
concurrent-ruby (~> 1.0, >= 1.3.1)
9+
connection_pool (>= 2.2.5)
10+
drb
11+
i18n (>= 1.6, < 2)
12+
logger (>= 1.4.2)
13+
minitest (>= 5.1)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
addressable (2.8.7)
17+
public_suffix (>= 2.0.2, < 7.0)
18+
base64 (0.2.0)
19+
benchmark (0.4.0)
20+
bigdecimal (3.1.9)
21+
coffee-script (2.4.1)
22+
coffee-script-source
23+
execjs
24+
coffee-script-source (1.12.2)
25+
colorator (1.1.0)
26+
commonmarker (0.23.11)
27+
concurrent-ruby (1.3.5)
28+
connection_pool (2.5.0)
29+
csv (3.3.2)
30+
dnsruby (1.72.3)
31+
base64 (~> 0.2.0)
32+
simpleidn (~> 0.2.1)
33+
drb (2.2.1)
34+
em-websocket (0.5.3)
35+
eventmachine (>= 0.12.9)
36+
http_parser.rb (~> 0)
37+
ethon (0.16.0)
38+
ffi (>= 1.15.0)
39+
eventmachine (1.2.7)
40+
execjs (2.10.0)
41+
faraday (2.12.2)
42+
faraday-net_http (>= 2.0, < 3.5)
43+
json
44+
logger
45+
faraday-net_http (3.4.0)
46+
net-http (>= 0.5.0)
47+
ffi (1.17.1-x86_64-linux-musl)
48+
forwardable-extended (2.6.0)
49+
gemoji (4.1.0)
50+
github-pages (232)
51+
github-pages-health-check (= 1.18.2)
52+
jekyll (= 3.10.0)
53+
jekyll-avatar (= 0.8.0)
54+
jekyll-coffeescript (= 1.2.2)
55+
jekyll-commonmark-ghpages (= 0.5.1)
56+
jekyll-default-layout (= 0.1.5)
57+
jekyll-feed (= 0.17.0)
58+
jekyll-gist (= 1.5.0)
59+
jekyll-github-metadata (= 2.16.1)
60+
jekyll-include-cache (= 0.2.1)
61+
jekyll-mentions (= 1.6.0)
62+
jekyll-optional-front-matter (= 0.3.2)
63+
jekyll-paginate (= 1.1.0)
64+
jekyll-readme-index (= 0.3.0)
65+
jekyll-redirect-from (= 0.16.0)
66+
jekyll-relative-links (= 0.6.1)
67+
jekyll-remote-theme (= 0.4.3)
68+
jekyll-sass-converter (= 1.5.2)
69+
jekyll-seo-tag (= 2.8.0)
70+
jekyll-sitemap (= 1.4.0)
71+
jekyll-swiss (= 1.0.0)
72+
jekyll-theme-architect (= 0.2.0)
73+
jekyll-theme-cayman (= 0.2.0)
74+
jekyll-theme-dinky (= 0.2.0)
75+
jekyll-theme-hacker (= 0.2.0)
76+
jekyll-theme-leap-day (= 0.2.0)
77+
jekyll-theme-merlot (= 0.2.0)
78+
jekyll-theme-midnight (= 0.2.0)
79+
jekyll-theme-minimal (= 0.2.0)
80+
jekyll-theme-modernist (= 0.2.0)
81+
jekyll-theme-primer (= 0.6.0)
82+
jekyll-theme-slate (= 0.2.0)
83+
jekyll-theme-tactile (= 0.2.0)
84+
jekyll-theme-time-machine (= 0.2.0)
85+
jekyll-titles-from-headings (= 0.5.3)
86+
jemoji (= 0.13.0)
87+
kramdown (= 2.4.0)
88+
kramdown-parser-gfm (= 1.1.0)
89+
liquid (= 4.0.4)
90+
mercenary (~> 0.3)
91+
minima (= 2.5.1)
92+
nokogiri (>= 1.16.2, < 2.0)
93+
rouge (= 3.30.0)
94+
terminal-table (~> 1.4)
95+
webrick (~> 1.8)
96+
github-pages-health-check (1.18.2)
97+
addressable (~> 2.3)
98+
dnsruby (~> 1.60)
99+
octokit (>= 4, < 8)
100+
public_suffix (>= 3.0, < 6.0)
101+
typhoeus (~> 1.3)
102+
html-pipeline (2.14.3)
103+
activesupport (>= 2)
104+
nokogiri (>= 1.4)
105+
http_parser.rb (0.8.0)
106+
i18n (1.14.7)
107+
concurrent-ruby (~> 1.0)
108+
jekyll (3.10.0)
109+
addressable (~> 2.4)
110+
colorator (~> 1.0)
111+
csv (~> 3.0)
112+
em-websocket (~> 0.5)
113+
i18n (>= 0.7, < 2)
114+
jekyll-sass-converter (~> 1.0)
115+
jekyll-watch (~> 2.0)
116+
kramdown (>= 1.17, < 3)
117+
liquid (~> 4.0)
118+
mercenary (~> 0.3.3)
119+
pathutil (~> 0.9)
120+
rouge (>= 1.7, < 4)
121+
safe_yaml (~> 1.0)
122+
webrick (>= 1.0)
123+
jekyll-avatar (0.8.0)
124+
jekyll (>= 3.0, < 5.0)
125+
jekyll-coffeescript (1.2.2)
126+
coffee-script (~> 2.2)
127+
coffee-script-source (~> 1.12)
128+
jekyll-commonmark (1.4.0)
129+
commonmarker (~> 0.22)
130+
jekyll-commonmark-ghpages (0.5.1)
131+
commonmarker (>= 0.23.7, < 1.1.0)
132+
jekyll (>= 3.9, < 4.0)
133+
jekyll-commonmark (~> 1.4.0)
134+
rouge (>= 2.0, < 5.0)
135+
jekyll-default-layout (0.1.5)
136+
jekyll (>= 3.0, < 5.0)
137+
jekyll-feed (0.17.0)
138+
jekyll (>= 3.7, < 5.0)
139+
jekyll-gist (1.5.0)
140+
octokit (~> 4.2)
141+
jekyll-github-metadata (2.16.1)
142+
jekyll (>= 3.4, < 5.0)
143+
octokit (>= 4, < 7, != 4.4.0)
144+
jekyll-include-cache (0.2.1)
145+
jekyll (>= 3.7, < 5.0)
146+
jekyll-mentions (1.6.0)
147+
html-pipeline (~> 2.3)
148+
jekyll (>= 3.7, < 5.0)
149+
jekyll-optional-front-matter (0.3.2)
150+
jekyll (>= 3.0, < 5.0)
151+
jekyll-paginate (1.1.0)
152+
jekyll-readme-index (0.3.0)
153+
jekyll (>= 3.0, < 5.0)
154+
jekyll-redirect-from (0.16.0)
155+
jekyll (>= 3.3, < 5.0)
156+
jekyll-relative-links (0.6.1)
157+
jekyll (>= 3.3, < 5.0)
158+
jekyll-remote-theme (0.4.3)
159+
addressable (~> 2.0)
160+
jekyll (>= 3.5, < 5.0)
161+
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
162+
rubyzip (>= 1.3.0, < 3.0)
163+
jekyll-sass-converter (1.5.2)
164+
sass (~> 3.4)
165+
jekyll-seo-tag (2.8.0)
166+
jekyll (>= 3.8, < 5.0)
167+
jekyll-sitemap (1.4.0)
168+
jekyll (>= 3.7, < 5.0)
169+
jekyll-swiss (1.0.0)
170+
jekyll-theme-architect (0.2.0)
171+
jekyll (> 3.5, < 5.0)
172+
jekyll-seo-tag (~> 2.0)
173+
jekyll-theme-cayman (0.2.0)
174+
jekyll (> 3.5, < 5.0)
175+
jekyll-seo-tag (~> 2.0)
176+
jekyll-theme-dinky (0.2.0)
177+
jekyll (> 3.5, < 5.0)
178+
jekyll-seo-tag (~> 2.0)
179+
jekyll-theme-hacker (0.2.0)
180+
jekyll (> 3.5, < 5.0)
181+
jekyll-seo-tag (~> 2.0)
182+
jekyll-theme-leap-day (0.2.0)
183+
jekyll (> 3.5, < 5.0)
184+
jekyll-seo-tag (~> 2.0)
185+
jekyll-theme-merlot (0.2.0)
186+
jekyll (> 3.5, < 5.0)
187+
jekyll-seo-tag (~> 2.0)
188+
jekyll-theme-midnight (0.2.0)
189+
jekyll (> 3.5, < 5.0)
190+
jekyll-seo-tag (~> 2.0)
191+
jekyll-theme-minimal (0.2.0)
192+
jekyll (> 3.5, < 5.0)
193+
jekyll-seo-tag (~> 2.0)
194+
jekyll-theme-modernist (0.2.0)
195+
jekyll (> 3.5, < 5.0)
196+
jekyll-seo-tag (~> 2.0)
197+
jekyll-theme-primer (0.6.0)
198+
jekyll (> 3.5, < 5.0)
199+
jekyll-github-metadata (~> 2.9)
200+
jekyll-seo-tag (~> 2.0)
201+
jekyll-theme-slate (0.2.0)
202+
jekyll (> 3.5, < 5.0)
203+
jekyll-seo-tag (~> 2.0)
204+
jekyll-theme-tactile (0.2.0)
205+
jekyll (> 3.5, < 5.0)
206+
jekyll-seo-tag (~> 2.0)
207+
jekyll-theme-time-machine (0.2.0)
208+
jekyll (> 3.5, < 5.0)
209+
jekyll-seo-tag (~> 2.0)
210+
jekyll-titles-from-headings (0.5.3)
211+
jekyll (>= 3.3, < 5.0)
212+
jekyll-watch (2.2.1)
213+
listen (~> 3.0)
214+
jemoji (0.13.0)
215+
gemoji (>= 3, < 5)
216+
html-pipeline (~> 2.2)
217+
jekyll (>= 3.0, < 5.0)
218+
json (2.9.1)
219+
kramdown (2.4.0)
220+
rexml
221+
kramdown-parser-gfm (1.1.0)
222+
kramdown (~> 2.0)
223+
liquid (4.0.4)
224+
listen (3.9.0)
225+
rb-fsevent (~> 0.10, >= 0.10.3)
226+
rb-inotify (~> 0.9, >= 0.9.10)
227+
logger (1.6.5)
228+
mercenary (0.3.6)
229+
minima (2.5.1)
230+
jekyll (>= 3.5, < 5.0)
231+
jekyll-feed (~> 0.9)
232+
jekyll-seo-tag (~> 2.1)
233+
minitest (5.25.4)
234+
net-http (0.6.0)
235+
uri
236+
nokogiri (1.18.2-x86_64-linux-musl)
237+
racc (~> 1.4)
238+
octokit (4.25.1)
239+
faraday (>= 1, < 3)
240+
sawyer (~> 0.9)
241+
pathutil (0.16.2)
242+
forwardable-extended (~> 2.6)
243+
public_suffix (5.1.1)
244+
racc (1.8.1)
245+
rb-fsevent (0.11.2)
246+
rb-inotify (0.11.1)
247+
ffi (~> 1.0)
248+
rexml (3.4.0)
249+
rouge (3.30.0)
250+
rubyzip (2.4.1)
251+
safe_yaml (1.0.5)
252+
sass (3.7.4)
253+
sass-listen (~> 4.0.0)
254+
sass-listen (4.0.0)
255+
rb-fsevent (~> 0.9, >= 0.9.4)
256+
rb-inotify (~> 0.9, >= 0.9.7)
257+
sawyer (0.9.2)
258+
addressable (>= 2.3.5)
259+
faraday (>= 0.17.3, < 3)
260+
securerandom (0.4.1)
261+
simpleidn (0.2.3)
262+
terminal-table (1.8.0)
263+
unicode-display_width (~> 1.1, >= 1.1.1)
264+
typhoeus (1.4.1)
265+
ethon (>= 0.9.0)
266+
tzinfo (2.0.6)
267+
concurrent-ruby (~> 1.0)
268+
unicode-display_width (1.8.0)
269+
uri (1.0.2)
270+
webrick (1.9.1)
271+
272+
PLATFORMS
273+
x86_64-linux-musl
274+
275+
DEPENDENCIES
276+
github-pages
277+
webrick
278+
279+
BUNDLED WITH
280+
2.3.25

‎_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# Name of your site (displayed in the header)
6-
name: Java User Group Darmstadt
6+
title: Java User Group Darmstadt
77

88
# Short bio or description (displayed in the header)
99
description: Community der Java Anwender in und um Darmstadt
@@ -78,7 +78,7 @@ sass:
7878
# style: :expanded # You might prefer to minify using :compressed
7979

8080
# Use the following plug-ins
81-
gems:
81+
plugins:
8282
- jekyll-sitemap # Create a sitemap using the official Jekyll sitemap gem
8383
- jemoji
8484

‎docker-compose.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
volumes:
2-
jugda_jekyll_data:
3-
name: jugda_jekyll_data
41
services:
52
jekyll:
6-
image: jekyll/jekyll:3.8
7-
command: jekyll serve --watch
3+
build: .
4+
image: jugda/jekyll
5+
command: jekyll serve --watch --incremental
86
ports:
97
- 4000:4000
108
volumes:
119
- .:/srv/jekyll:cached
12-
- jugda_jekyll_data:/usr/local/bundle

0 commit comments

Comments
 (0)