Skip to content

Commit 2a6cd2f

Browse files
committed
Updated sitebuilder
jekyll 3.9.2 hugo 0.101.0 extended mkdocs 1.3.0 with mkdocs-material 8.3.6 Signed-off-by: Samir B Amin <sbamin@alumni.bcm.edu>
1 parent 3f656ff commit 2a6cd2f

4 files changed

Lines changed: 46 additions & 60 deletions

File tree

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ FROM ruby:2.7.3
88
## For questions, visit https:
99
MAINTAINER "Samir B. Amin" <tweet:sbamin; sbamin.com/contact>
1010

11-
LABEL version="1.4.3" \
12-
mode="sitebuilder-1.4.3" \
11+
LABEL version="1.4.4" \
12+
mode="sitebuilder-1.4.4" \
1313
description="docker image to build jekyll, hugo or mkdocs supported website" \
1414
website="https://github.com/sbamin/sitebuilder" \
1515
issues="https://github.com/sbamin/sitebuilder/issues"
@@ -58,9 +58,9 @@ RUN apt-get update && \
5858
pip3 install --upgrade markdown pygments fontawesome_markdown pymdown-extensions && \
5959
pip3 install --upgrade mkdocs mkdocs-material mkdocs-git-revision-date-plugin mkdocs-git-revision-date-localized-plugin mkdocs-minify-plugin mkdocs-redirects pymdown-extensions mkdocs-macros-plugin mike && \
6060
## install latest hugo extended
61-
wget https://github.com/gohugoio/hugo/releases/download/v0.98.0/hugo_extended_0.98.0_Linux-64bit.deb && \
62-
apt install ./hugo_extended_0.98.0_Linux-64bit.deb -y && \
63-
rm hugo_extended_0.98.0_Linux-64bit.deb && \
61+
wget https://github.com/gohugoio/hugo/releases/download/v0.101.0/hugo_extended_0.101.0_Linux-64bit.deb && \
62+
apt install ./hugo_extended_0.101.0_Linux-64bit.deb -y && \
63+
rm hugo_extended_0.101.0_Linux-64bit.deb && \
6464
apt-get clean && \
6565
rm -rf /var/lib/apt/lists/*
6666

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ group :sitebuilder do
88
gem 'jekyll-mentions', '>= 1.6.0'
99
gem 'jekyll-twitter-plugin'
1010
gem 'ffi', '>= 1.11.1'
11-
gem 'nokogiri', '>= 1.13.4'
11+
gem 'nokogiri', '>= 1.13.6', '< 2.0'
1212
end

Gemfile.lock

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.4.8)
4+
activesupport (6.0.5)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
@@ -14,7 +14,7 @@ GEM
1414
execjs
1515
coffee-script-source (1.11.1)
1616
colorator (1.1.0)
17-
commonmarker (0.23.4)
17+
commonmarker (0.23.5)
1818
concurrent-ruby (1.1.10)
1919
dnsruby (1.61.9)
2020
simpleidn (~> 0.1)
@@ -25,29 +25,10 @@ GEM
2525
ffi (>= 1.15.0)
2626
eventmachine (1.2.7)
2727
execjs (2.8.1)
28-
faraday (1.10.0)
29-
faraday-em_http (~> 1.0)
30-
faraday-em_synchrony (~> 1.0)
31-
faraday-excon (~> 1.1)
32-
faraday-httpclient (~> 1.0)
33-
faraday-multipart (~> 1.0)
34-
faraday-net_http (~> 1.0)
35-
faraday-net_http_persistent (~> 1.0)
36-
faraday-patron (~> 1.0)
37-
faraday-rack (~> 1.0)
38-
faraday-retry (~> 1.0)
28+
faraday (2.3.0)
29+
faraday-net_http (~> 2.0)
3930
ruby2_keywords (>= 0.0.4)
40-
faraday-em_http (1.0.0)
41-
faraday-em_synchrony (1.0.0)
42-
faraday-excon (1.1.0)
43-
faraday-httpclient (1.0.1)
44-
faraday-multipart (1.0.3)
45-
multipart-post (>= 1.2, < 3)
46-
faraday-net_http (1.0.1)
47-
faraday-net_http_persistent (1.2.0)
48-
faraday-patron (1.0.0)
49-
faraday-rack (1.0.0)
50-
faraday-retry (1.0.3)
31+
faraday-net_http (2.0.3)
5132
ffi (1.15.5)
5233
forwardable-extended (2.6.0)
5334
gemoji (3.0.1)
@@ -102,7 +83,7 @@ GEM
10283
octokit (~> 4.0)
10384
public_suffix (>= 3.0, < 5.0)
10485
typhoeus (~> 1.3)
105-
html-pipeline (2.14.1)
86+
html-pipeline (2.14.2)
10687
activesupport (>= 2)
10788
nokogiri (>= 1.4)
10889
http_parser.rb (0.8.0)
@@ -231,14 +212,13 @@ GEM
231212
jekyll (>= 3.5, < 5.0)
232213
jekyll-feed (~> 0.9)
233214
jekyll-seo-tag (~> 2.1)
234-
minitest (5.15.0)
235-
multipart-post (2.1.1)
236-
nokogiri (1.13.4)
215+
minitest (5.16.0)
216+
nokogiri (1.13.6)
237217
mini_portile2 (~> 2.8.0)
238218
racc (~> 1.4)
239-
octokit (4.22.0)
240-
faraday (>= 0.9)
241-
sawyer (~> 0.8.0, >= 0.5.3)
219+
octokit (4.25.0)
220+
faraday (>= 1, < 3)
221+
sawyer (~> 0.9)
242222
pathutil (0.16.2)
243223
forwardable-extended (~> 2.6)
244224
public_suffix (4.0.7)
@@ -256,9 +236,9 @@ GEM
256236
sass-listen (4.0.0)
257237
rb-fsevent (~> 0.9, >= 0.9.4)
258238
rb-inotify (~> 0.9, >= 0.9.7)
259-
sawyer (0.8.2)
239+
sawyer (0.9.2)
260240
addressable (>= 2.3.5)
261-
faraday (> 0.8, < 2.0)
241+
faraday (>= 0.17.3, < 3)
262242
simpleidn (0.2.1)
263243
unf (~> 0.1.4)
264244
terminal-table (1.8.0)
@@ -270,9 +250,9 @@ GEM
270250
thread_safe (~> 0.1)
271251
unf (0.1.4)
272252
unf_ext
273-
unf_ext (0.0.8.1)
253+
unf_ext (0.0.8.2)
274254
unicode-display_width (1.8.0)
275-
zeitwerk (2.5.4)
255+
zeitwerk (2.6.0)
276256

277257
PLATFORMS
278258
ruby
@@ -285,7 +265,7 @@ DEPENDENCIES
285265
jekyll-mentions (>= 1.6.0)
286266
jekyll-redirect-from (>= 0.16.0)
287267
jekyll-twitter-plugin
288-
nokogiri (>= 1.13.4)
268+
nokogiri (>= 1.13.6, < 2.0)
289269

290270
BUNDLED WITH
291271
2.1.4

update_sitebuilder.md

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ git status
1515

1616
>status should be up-to-date and point to `main` git branch.
1717
18-
* Define docker image tag, e.g., `1.4.2` typically a level up than [the current version](https://hub.docker.com/r/sbamin/sitebuilder/tags). You need to manually update several of commands below to reflect an updated tag.
18+
* Define docker image tag, e.g., `1.4.3` typically a level up than [the current version](https://hub.docker.com/r/sbamin/sitebuilder/tags). You need to manually update several of commands below to reflect an updated tag.
1919

20-
* Update `Dockerfile` as per your custom changes. At minimum, update LABEL version and mode to reflect an updated tag. You can also update `hugo extended` to the [current release](https://github.com/gohugoio/hugo/releases) by updating respective occurrences of `hugo_extended_0.95.0_Linux-64bit.deb` in `Dockerfile`.
20+
* Update `Dockerfile` as per your custom changes. At minimum, update LABEL version and mode to reflect an updated tag. You can also update `hugo extended` to the [current release](https://github.com/gohugoio/hugo/releases) by updating respective occurrences of `hugo_extended_0.101.0_Linux-64bit.deb` in `Dockerfile`.
2121

22-
* If you need to update [jekyll](https://jekyllrb.com/) related gems, update `Gemfile`.
22+
* If you need to update [jekyll](https://jekyllrb.com/) related gems, update `Gemfile` while ensuring gem [version requirements](https://pages.github.com/versions/) for [github-pages](https://github.com/github/pages-gem) gem.
2323

2424
* Start building a docker image. You need to replace `foo/sitebuilder` with your respective [docker hub user id](https://hub.docker.com) and image name you like to rename. Read [manpage for docker build](https://docs.docker.com/engine/reference/commandline/build/).
2525

2626
```sh
27-
docker build -t foo/sitebuilder:1.4.2 .
27+
docker build -t foo/sitebuilder:1.4.3 .
2828
```
2929

3030
* Once image is successfully built, copy `Gemfile.lock` back to host, so that we can update it with the most recent versions of gems.
3131

3232
```sh
3333
## start container in an interactive session and mount local (host) directory
3434
## to an empty location in the docker container.
35-
docker run -it -v "$(pwd)":/hostspace foo/sitebuilder:1.4.2 /bin/bash
35+
docker run -it -v "$(pwd)":/hostspace foo/sitebuilder:1.4.3 /bin/bash
3636

3737
## copy (overwrite) local Gemfile.lock with an updated version from
3838
## the container
@@ -51,10 +51,9 @@ git status
5151
* Check installed or updated package versions
5252

5353
```sh
54-
docker run --rm foo/sitebuilder:1.4.2 /bin/bash -c "jekyll --version"
55-
docker run --rm foo/sitebuilder:1.4.2 /bin/bash -c "hugo version"
56-
docker run --rm foo/sitebuilder:1.4.2 /bin/bash -c "pip list | grep
57-
mkdocs"
54+
docker run --rm foo/sitebuilder:1.4.3 /bin/bash -c "jekyll --version"
55+
docker run --rm foo/sitebuilder:1.4.3 /bin/bash -c "hugo version"
56+
docker run --rm foo/sitebuilder:1.4.3 /bin/bash -c "pip list | grep mkdocs"
5857
```
5958

6059
* Commit and push those to github.
@@ -67,9 +66,9 @@ git add Dockerfile Gemfile Gemfile.lock
6766
git commit -s -F- <<EOF
6867
Updated sitebuilder
6968
70-
jekyll 3.9.0
71-
hugo 0.95.0 extended
72-
mkdocs 1.2.3 with mkdocs-material 8.2.5
69+
jekyll 3.9.2
70+
hugo 0.101.0 extended
71+
mkdocs 1.3.0 with mkdocs-material 8.3.6
7372
EOF
7473

7574
git push
@@ -82,26 +81,33 @@ Upload your docker image to [docker hub](https://www.docker.com), [github packag
8281
* Tag or alias updated image to `latest`. This will overwrite existing alias to `latest` which is typically an older image, e.g., 1.4.1
8382

8483
```sh
85-
docker tag foo/sitebuilder:1.4.2 foo/sitebuilder:latest
84+
docker tag foo/sitebuilder:1.4.3 foo/sitebuilder:latest
8685
```
8786

8887
* Besides updating Docker Hub, if you are updating image also to github packages, update respective aliases.
8988

9089
```sh
91-
docker tag foo/sitebuilder:1.4.2 ghcr.io/foo/sitebuilder:1.4.2
92-
docker tag foo/sitebuilder:1.4.2 ghcr.io/foo/sitebuilder:latest
90+
docker tag foo/sitebuilder:1.4.3 ghcr.io/foo/sitebuilder:1.4.3
91+
docker tag foo/sitebuilder:1.4.3 ghcr.io/foo/sitebuilder:latest
9392
```
9493

95-
* Confirm using `docker images` that IMAGE ID of a built image, `foo/sitebuilder:1.4.2` matches with aliases created above.
94+
* Confirm using `docker images` that IMAGE ID of a built image, `foo/sitebuilder:1.4.3` matches with aliases created above.
9695

9796
* Push images to docker hub and/or github packages. For github container registry, see [this guide](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry) on authentication.
9897

9998
```sh
100-
docker push foo/sitebuilder:1.4.2
99+
docker push foo/sitebuilder:1.4.3
101100
docker push foo/sitebuilder:latest
102101

103-
docker push ghcr.io/foo/sitebuilder:1.4.2
102+
docker push ghcr.io/foo/sitebuilder:1.4.3
104103
docker push ghcr.io/foo/sitebuilder:latest
105104
```
106105

106+
### Get singularity SIF image
107+
108+
If you prefer using [singularity](https://docs.sylabs.io/guides/3.5/user-guide/singularity_and_docker.html) SIF image, run following command to get an updated SIF image.
109+
110+
```sh
111+
singularity run docker://sbamin/sitebuilder:latest
112+
```
107113
Done!

0 commit comments

Comments
 (0)