Skip to content

Commit

Permalink
chore: Update Ruby version in Dockerfile.github to 3.3 + disable gitl…
Browse files Browse the repository at this point in the history
…ab container
  • Loading branch information
Yehonal committed Aug 26, 2024
1 parent f360cfc commit 699bc60
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .env-files/Dockerfile.github
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ruby:2.7.0

# The ruby version should be in sync with this: https://github.com/github/pages-gem/blob/master/Dockerfile#L1
FROM ruby:3.3
ENV LC_ALL=C.UTF-8=value

ADD . /srv/jekyll
Expand Down
30 changes: 16 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
version: '3.7'
services:
github-wiki-theme:
build:
build:
context: .
dockerfile: .env-files/Dockerfile.github
ports:
- 4000:4000
- 35729:35729
environment:
- BUNDLE_GEMFILE=.env-files/Gemfile.github
- 4000:4000
- 35729:35729
environment:
- BUNDLE_GEMFILE=.env-files/Gemfile.github
volumes:
- .:/srv/jekyll
- github_site:/srv/jekyll/_site
- .:/srv/jekyll
- github_site:/srv/jekyll/_site
command: bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload
gitlab-wiki-theme:
build:
build:
context: .
dockerfile: .env-files/Dockerfile.gitlab
ports:
- 4000:4000
- 35729:35729
environment:
- BUNDLE_GEMFILE=.env-files/Gemfile.gitlab
environment:
- BUNDLE_GEMFILE=.env-files/Gemfile.gitlab
volumes:
- .:/srv/jekyll
- gitlab_site:/srv/jekyll/_site
- .:/srv/jekyll
- gitlab_site:/srv/jekyll/_site
command: 'bundle exec jekyll serve --host 0.0.0.0 --force_polling --livereload'
volumes:
profiles:
- gitlab
volumes:
github_site:
gitlab_site:
gitlab_site:

0 comments on commit 699bc60

Please sign in to comment.