From c60603b5ca8c4807d2e86595c0ea5b6f1cbf0322 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Tue, 27 Aug 2024 00:01:10 +0200 Subject: [PATCH] chore: Update Ruby version to 3.3 in Dockerfile.github --- .env-files/Dockerfile.github | 2 +- README.md | 4 +++- docker-compose.yml | 30 ++++++++++++++++-------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.env-files/Dockerfile.github b/.env-files/Dockerfile.github index 8ac84ced..c4493796 100644 --- a/.env-files/Dockerfile.github +++ b/.env-files/Dockerfile.github @@ -1,4 +1,4 @@ -FROM ruby:2.7.0 +FROM ruby:3.3 ENV LC_ALL=C.UTF-8=value diff --git a/README.md b/README.md index cffe4be4..3a332ad9 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,15 @@ This is a [skeleton](skeleton) repository that can be used as a template to boot For documentation, installation guide and demo of git-wiki-theme visit [THIS PAGE](http://drassil.github.io/git-wiki/) +To report an issue, please use the [git-wiki-theme issues](https://github.com/Drassil/git-wiki-theme/issues) + ## The git-wiki project The git-wiki project is composed by 3 different repository: - [git-wiki-theme](https://github.com/Drassil/git-wiki-theme): This is the repository of the theme that implements the wiki functionalities. You would have not fork it unless you need to send a Pull Request or create your wiki project from scratch. -- [git-wiki-skeleton](https://github.com/Drassil/git-wiki-skeleton): This is the repo that you should fork or use as a template. It uses the [jekyll remote theme](https://github.com/benbalter/jekyll-remote-theme) functionality that allows you to create your own wiki based on git-wiki-theme. By using the remote functionality you can automatically keep your wiki always updated with latest features from the **git-wiki-theme**, but you can also fully customize it. +- [git-wiki-skeleton](https://github.com/Drassil/git-wiki-skeleton): This is the repo that you should fork or use as a template. It uses the [jekyll remote theme](https://github.com/benbalter/jekyll-remote-theme) functionality that allows you to create your own wiki based on git-wiki-theme. By using the remote functionality you can automatically keep your wiki always updated with latest features from the **git-wiki-theme**, but you can also fully customize it. - [git-wiki](https://github.com/Drassil/git-wiki): This is the documentation repository and website of the **git-wiki-theme** project. You would have not fork it unless you want to contribute to the git-wiki project documentation. diff --git a/docker-compose.yml b/docker-compose.yml index ffb7a088..7af29f58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,31 +1,33 @@ version: '3.7' services: github-wiki-skeleton: - 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-skeleton: - 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: \ No newline at end of file + gitlab_site: