upgraded docker & gemfile

Drassil · Jan 10, 2020 · db390ca · db390ca
1 parent b307992
commit db390ca
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 18 deletions.
diff --git a/.env-files/Dockerfile.github 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
diff --git a/.env-files/Dockerfile.gitlab 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
diff --git a/.env-files/Gemfile.github 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
diff --git a/.env-files/Gemfile.gitlab 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"
diff --git a/Dockerfile b/Dockerfile
diff --git a/Gemfile b/Gemfile
diff --git 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
+     - 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: