diff options
| -rw-r--r-- | .env-files/Dockerfile.github | 11 | ||||
| -rw-r--r-- | .env-files/Dockerfile.gitlab | 11 | ||||
| -rw-r--r-- | .env-files/Gemfile.github | 3 | ||||
| -rw-r--r-- | .env-files/Gemfile.gitlab | 18 | ||||
| -rw-r--r-- | Dockerfile | 13 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 27 |
7 files changed, 67 insertions, 18 deletions
diff --git a/.env-files/Dockerfile.github b/.env-files/Dockerfile.github new file mode 100644 index 0000000..8ac84ce --- /dev/null +++ b/.env-files/Dockerfile.github @@ -0,0 +1,11 @@ +FROM ruby:2.7.0 + +ENV LC_ALL=C.UTF-8=value + +ADD . /srv/jekyll + +WORKDIR /srv/jekyll + +RUN bundle install --gemfile=.env-files/Gemfile.github + +EXPOSE 4000
\ No newline at end of file diff --git a/.env-files/Dockerfile.gitlab b/.env-files/Dockerfile.gitlab new file mode 100644 index 0000000..5e120bc --- /dev/null +++ b/.env-files/Dockerfile.gitlab @@ -0,0 +1,11 @@ +FROM ruby:2.7.0 + +ENV LC_ALL=C.UTF-8=value + +ADD . /srv/jekyll + +WORKDIR /srv/jekyll + +RUN bundle install --gemfile=.env-files/Gemfile.gitlab + +EXPOSE 4000
\ No newline at end of file diff --git a/.env-files/Gemfile.github b/.env-files/Gemfile.github new file mode 100644 index 0000000..8eceee6 --- /dev/null +++ b/.env-files/Gemfile.github @@ -0,0 +1,3 @@ +source 'http://rubygems.org' +gem 'github-pages', group: :jekyll_plugins +gem "jekyll-gitlab-metadata" # for cross compatibility
\ No newline at end of file diff --git a/.env-files/Gemfile.gitlab b/.env-files/Gemfile.gitlab new file mode 100644 index 0000000..b61bb05 --- /dev/null +++ b/.env-files/Gemfile.gitlab @@ -0,0 +1,18 @@ +source 'http://rubygems.org' +gem "jekyll-avatar" +gem "jekyll-coffeescript" +gem "jekyll-default-layout" +gem "jekyll-feed" +gem "jekyll-gist" +gem "jekyll-paginate" +gem "jekyll-mentions" +gem "jekyll-optional-front-matter" +gem "jekyll-readme-index" +gem "jekyll-redirect-from" +gem "jekyll-remote-theme" +gem "jekyll-relative-links" +gem "jekyll-seo-tag" +gem "jekyll-sitemap" +gem "jekyll-titles-from-headings" +gem "jemoji" +gem "jekyll-gitlab-metadata"
\ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ad7f289..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM jekyll/jekyll:pages - -COPY Gemfile* /srv/jekyll/ - -WORKDIR /srv/jekyll - -RUN apk update && \ - apk add ruby-dev gcc make curl build-base libc-dev libffi-dev zlib-dev libxml2-dev libgcrypt-dev libxslt-dev python - -RUN bundle config build.nokogiri --use-system-libraries && \ - bundle install - -EXPOSE 4000
\ No newline at end of file diff --git a/Gemfile b/Gemfile deleted file mode 100644 index f98d657..0000000 --- a/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'http://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
\ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 362fd7c..f8a4a99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,31 @@ version: '3.7' services: - git-wiki-theme: - build: . + github-wiki-theme: + build: + context: . + dockerfile: .env-files/Dockerfile.github ports: - 4000:4000 - 35729:35729 + environment: + - BUNDLE_GEMFILE=.env-files/Gemfile.github volumes: - .:/srv/jekyll - command: bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload
\ No newline at end of file + - github_site:/srv/jekyll/_site + command: bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload + gitlab-wiki-theme: + build: + context: . + dockerfile: .env-files/Dockerfile.gitlab + ports: + - 4000:4000 + - 35729:35729 + environment: + - BUNDLE_GEMFILE=.env-files/Gemfile.gitlab + volumes: + - .:/srv/jekyll + - gitlab_site:/srv/jekyll/_site + command: 'bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload' +volumes: + github_site: + gitlab_site:
\ No newline at end of file |