Commit be9e335a authored by Jacek Lebioda's avatar Jacek Lebioda
Browse files

Merge branch 'update-to-1.7' into 'master'

feat: new version

See merge request !14
parents 6965e263 c291f017
Pipeline #32798 passed with stage
in 7 minutes and 36 seconds
...@@ -28,70 +28,84 @@ GEM ...@@ -28,70 +28,84 @@ GEM
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0) colorator (1.1.0)
concurrent-ruby (1.1.6) concurrent-ruby (1.1.7)
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
eventmachine (1.2.7) eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32) eventmachine (1.2.7-x64-mingw32)
ffi (1.12.2) ffi (1.13.1)
ffi (1.12.2-x64-mingw32) ffi (1.13.1-x64-mingw32)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
gemoji (3.0.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.2) i18n (1.8.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.0.0) jekyll (4.1.1)
addressable (~> 2.4) addressable (~> 2.4)
colorator (~> 1.0) colorator (~> 1.0)
em-websocket (~> 0.5) em-websocket (~> 0.5)
i18n (>= 0.9.5, < 2) i18n (~> 1.0)
jekyll-sass-converter (~> 2.0) jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0) jekyll-watch (~> 2.0)
kramdown (~> 2.1) kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0) kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0) liquid (~> 4.0)
mercenary (~> 0.3.3) mercenary (~> 0.4.0)
pathutil (~> 0.9) pathutil (~> 0.9)
rouge (~> 3.0) rouge (~> 3.0)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
terminal-table (~> 1.8) terminal-table (~> 1.8)
jekyll-feed (0.13.0) jekyll-feed (0.15.0)
jekyll (>= 3.7, < 5.0) jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.1.0) jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0) sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1) jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0) jekyll (>= 3.3, < 5.0)
jekyll-spaceship (0.9.2)
gemoji (~> 3.0)
jekyll (>= 3.6, < 5.0)
nokogiri (~> 1.6)
rainbow (~> 3.0)
jekyll-watch (2.2.1) jekyll-watch (2.2.1)
listen (~> 3.0) listen (~> 3.0)
kramdown (2.1.0) kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0) kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0) kramdown (~> 2.0)
liquid (4.0.3) liquid (4.0.3)
listen (3.2.1) listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6) mercenary (0.4.0)
mini_portile2 (2.4.0)
minima (2.5.1) minima (2.5.1)
jekyll (>= 3.5, < 5.0) jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9) jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1) jekyll-seo-tag (~> 2.1)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.10-x64-mingw32)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (4.0.4) public_suffix (4.0.6)
rb-fsevent (0.10.3) rainbow (3.0.0)
rb-fsevent (0.10.4)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rouge (3.18.0) rexml (3.2.4)
rouge (3.23.0)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sassc (2.3.0) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
sassc (2.3.0-x64-mingw32) sassc (2.4.0-x64-mingw32)
ffi (~> 1.9) ffi (~> 1.9)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
tzinfo (2.0.2) tzinfo (2.0.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
tzinfo-data (1.2019.3) tzinfo-data (1.2020.1)
tzinfo (>= 1.0.0) tzinfo (>= 1.0.0)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
...@@ -104,6 +118,7 @@ DEPENDENCIES ...@@ -104,6 +118,7 @@ DEPENDENCIES
jekyll (~> 4.0) jekyll (~> 4.0)
jekyll-feed (~> 0.6) jekyll-feed (~> 0.6)
jekyll-paginate-v2 (~> 3)! jekyll-paginate-v2 (~> 3)!
jekyll-spaceship
jekyll-theme-lcsb-default (~> 0.3.18)! jekyll-theme-lcsb-default (~> 0.3.18)!
jekyll-theme-lcsb-frozen-components (~> 0.0.2)! jekyll-theme-lcsb-frozen-components (~> 0.0.2)!
minima (~> 2.5) minima (~> 2.5)
......
...@@ -2,17 +2,19 @@ ...@@ -2,17 +2,19 @@
A Docker base-image containing Ruby dependencies for Jekyll instances using Jekyll-LCSB-Theme. A Docker base-image containing Ruby dependencies for Jekyll instances using Jekyll-LCSB-Theme.
# Versions # Versions
| Tag | Jekyll version | Bundler version | Theme version | | Tag | Jekyll version | Bundler version | Theme version | Additional |
|:-----------------:|:--------------:|-----------------|---------------| |:-----------------:|:--------------:|-----------------|---------------|------------|
| 1.5 (or latest) | Jekyll 4.0.0 | 2.1.4 | 0.3.18 | | 1.7 (or latest) | Jekyll 4.1.1 | 2.1.4 | 0.3.18 | Spaceship |
| 1.4 | Jekyll 4.0.0 | 2.0.2 | 0.3.6 | | 1.6 | Jekyll 4.0.0 | 2.1.4 | 0.3.18 | Spaceship |
| 1.3 | Jekyll 4.0.0 | 2.0.2 | 0.3.3 | | 1.5 | Jekyll 4.0.0 | 2.1.4 | 0.3.18 | |
| 1.2 | Jekyll 4.0.0 | 2.0.2 | 0.3.3 | | 1.4 | Jekyll 4.0.0 | 2.0.2 | 0.3.6 | |
| 1.1 | Jekyll 4.0.0 | 2.0.2 | 0.3.3 | | 1.3 | Jekyll 4.0.0 | 2.0.2 | 0.3.3 | |
| 1.0 | Jekyll 4.0.0 | 2.0.2 | 0.3.0 | | 1.2 | Jekyll 4.0.0 | 2.0.2 | 0.3.3 | |
| 0.1 (or legacy) | Jekyll 3.8.6 | 1.17.3 | 0.3.0 | | 1.1 | Jekyll 4.0.0 | 2.0.2 | 0.3.3 | |
| 1.0 | Jekyll 4.0.0 | 2.0.2 | 0.3.0 | |
# How to use? | 0.1 (or legacy) | Jekyll 3.8.6 | 1.17.3 | 0.3.0 | |
# How to use? (for developers of applications using the image)
In your `.gitlab-ci.yml` file add the following line (make sure `r3` is written in lower-case): In your `.gitlab-ci.yml` file add the following line (make sure `r3` is written in lower-case):
``` ```
...@@ -24,8 +26,11 @@ image: git-r3lab.uni.lu:4567/r3/docker/jekyll-lcsb:0.1 ...@@ -24,8 +26,11 @@ image: git-r3lab.uni.lu:4567/r3/docker/jekyll-lcsb:0.1
For the reproducibility, it's good if you pin the version to a specific tag, e.g. `1.3` instead of `latest`. For the reproducibility, it's good if you pin the version to a specific tag, e.g. `1.3` instead of `latest`.
# How to build and push to the repository? # How to update this repository (for developers of this repository)
It is handled by gitlab-CI automatically (see `.gitlab-ci.yml`) when you tag the commit. Locally, change `Gemfile` and run `bundle update`. Commit `Gemfile.lock`, and tag the commit.
# How to build and push to the repository manually? (for developers of this repository)
Normally it is handled by gitlab-CI automatically (see `.gitlab-ci.yml`) when you tag the commit.
Anyway, if you'd like to do it yourself, perform these steps: Anyway, if you'd like to do it yourself, perform these steps:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment