Skip to content

Commit db390ca

Browse files
committed
upgraded docker & gemfile
1 parent b307992 commit db390ca

File tree

7 files changed

+67
-18
lines changed

7 files changed

+67
-18
lines changed

.env-files/Dockerfile.github

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ruby:2.7.0
2+
3+
ENV LC_ALL=C.UTF-8=value
4+
5+
ADD . /srv/jekyll
6+
7+
WORKDIR /srv/jekyll
8+
9+
RUN bundle install --gemfile=.env-files/Gemfile.github
10+
11+
EXPOSE 4000

.env-files/Dockerfile.gitlab

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ruby:2.7.0
2+
3+
ENV LC_ALL=C.UTF-8=value
4+
5+
ADD . /srv/jekyll
6+
7+
WORKDIR /srv/jekyll
8+
9+
RUN bundle install --gemfile=.env-files/Gemfile.gitlab
10+
11+
EXPOSE 4000

.env-files/Gemfile.github

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source 'http://rubygems.org'
2+
gem 'github-pages', group: :jekyll_plugins
3+
gem "jekyll-gitlab-metadata" # for cross compatibility

.env-files/Gemfile.gitlab

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
source 'http://rubygems.org'
2+
gem "jekyll-avatar"
3+
gem "jekyll-coffeescript"
4+
gem "jekyll-default-layout"
5+
gem "jekyll-feed"
6+
gem "jekyll-gist"
7+
gem "jekyll-paginate"
8+
gem "jekyll-mentions"
9+
gem "jekyll-optional-front-matter"
10+
gem "jekyll-readme-index"
11+
gem "jekyll-redirect-from"
12+
gem "jekyll-remote-theme"
13+
gem "jekyll-relative-links"
14+
gem "jekyll-seo-tag"
15+
gem "jekyll-sitemap"
16+
gem "jekyll-titles-from-headings"
17+
gem "jemoji"
18+
gem "jekyll-gitlab-metadata"

Dockerfile

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

Gemfile

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

docker-compose.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
11
version: '3.7'
22
services:
3-
git-wiki-theme:
4-
build: .
3+
github-wiki-theme:
4+
build:
5+
context: .
6+
dockerfile: .env-files/Dockerfile.github
57
ports:
68
- 4000:4000
79
- 35729:35729
10+
environment:
11+
- BUNDLE_GEMFILE=.env-files/Gemfile.github
812
volumes:
913
- .:/srv/jekyll
10-
command: bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload
14+
- github_site:/srv/jekyll/_site
15+
command: bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload
16+
gitlab-wiki-theme:
17+
build:
18+
context: .
19+
dockerfile: .env-files/Dockerfile.gitlab
20+
ports:
21+
- 4000:4000
22+
- 35729:35729
23+
environment:
24+
- BUNDLE_GEMFILE=.env-files/Gemfile.gitlab
25+
volumes:
26+
- .:/srv/jekyll
27+
- gitlab_site:/srv/jekyll/_site
28+
command: 'bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload'
29+
volumes:
30+
github_site:
31+
gitlab_site:

0 commit comments

Comments
 (0)