Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Update bundler to 2.2.15, update gems, add .dockerignore #669

Merged
merged 4 commits into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**
!/Gemfile
!/Gemfile.lock
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ RUN apt-get update && \
apt-get install -y ruby-full build-essential zlib1g-dev wget python2.7 libpython2.7

RUN cd /tmp && \
wget https://github.com/wjdp/htmltest/releases/download/v0.13.0/htmltest_0.13.0_linux_amd64.tar.gz && \
tar xvzf htmltest_0.13.0_linux_amd64.tar.gz && \
wget https://github.com/wjdp/htmltest/releases/download/v0.14.0/htmltest_0.14.0_linux_amd64.tar.gz && \
tar xvzf htmltest_0.14.0_linux_amd64.tar.gz && \
mv htmltest /usr/local/bin

RUN mkdir /root/gems
Expand All @@ -15,7 +15,7 @@ ENV PATH="/root/gems/bin:${PATH}"
# python md script needs that :S
ENV LC_ALL=C.UTF-8

RUN gem install bundler:2.2.2 jekyll
RUN gem install bundler:2.2.15 jekyll

VOLUME /docs
WORKDIR /docs
Expand Down
40 changes: 22 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ GEM
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algolia_html_extractor (2.6.2)
algolia_html_extractor (2.6.4)
json (~> 2.0)
nokogiri (~> 1.10.4)
nokogiri (~> 1.10)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
colorator (1.1.0)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.13.1)
ffi (1.13.1-x64-mingw32)
ffi (1.15.0)
ffi (1.15.0-x64-mingw32)
filesize (0.2.0)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
httpclient (2.8.3)
i18n (1.8.5)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
addressable (~> 2.4)
Expand Down Expand Up @@ -54,29 +54,33 @@ GEM
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.4.1)
kramdown (2.3.0)
json (2.5.1)
kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.3.3)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.4.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.10-x64-mingw32)
mini_portile2 (~> 2.4.0)
mini_portile2 (2.5.0)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.2-x64-mingw32)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
progressbar (1.10.1)
progressbar (1.11.0)
public_suffix (4.0.6)
racc (1.5.2)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rexml (3.2.5)
rouge (3.26.0)
safe_yaml (1.0.5)
sassc (2.4.0)
Expand All @@ -87,7 +91,7 @@ GEM
unicode-display_width (~> 1.1, >= 1.1.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2020.4)
tzinfo-data (1.2021.1)
tzinfo (>= 1.0.0)
unicode-display_width (1.7.0)
verbal_expressions (0.1.5)
Expand All @@ -106,4 +110,4 @@ DEPENDENCIES
wdm (~> 0.1.1)

BUNDLED WITH
2.2.2
2.2.15
4 changes: 2 additions & 2 deletions netlify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cp -a _site htmltest/docs
cp _redirects htmltest

(cd /tmp && \
wget -nv https://github.com/wjdp/htmltest/releases/download/v0.13.0/htmltest_0.13.0_linux_amd64.tar.gz && \
tar xvzf htmltest_0.13.0_linux_amd64.tar.gz
wget -nv https://github.com/wjdp/htmltest/releases/download/v0.14.0/htmltest_0.14.0_linux_amd64.tar.gz && \
tar xvzf htmltest_0.14.0_linux_amd64.tar.gz
)

/tmp/htmltest -s