Skip to content

Commit 9ac27a5

Browse files
sbaminsbamin
committed
Updated sitebuilder
v1.5.5 ## amd64 jekyll 3.10.0 hugo v0.141.0-e7bd51698e5c3778a86003018702b1a7dcb9559a+extended linux/amd64 BuildDate=2025-01-16T13:11:18Z VendorInfo=gohugoio git version 2.39.5 go version go1.23.5 linux/amd64 mkdocs 1.6.1 mkdocs-get-deps 0.2.0 mkdocs-git-authors-plugin 0.9.2 mkdocs-git-committers-plugin-2 2.4.1 mkdocs-git-revision-date-localized-plugin 1.3.0 mkdocs-git-revision-date-plugin 0.3.2 mkdocs-glightbox 0.4.0 mkdocs-macros-plugin 1.3.7 mkdocs-material 9.5.50 mkdocs-material-extensions 1.3.1 mkdocs-minify-plugin 0.8.0 mkdocs-redirects 1.2.2 mkdocs-rss-plugin 1.17.1 ## arm64 jekyll 3.10.0 hugo v0.141.0-e7bd51698e5c3778a86003018702b1a7dcb9559a+extended linux/arm64 BuildDate=2025-01-16T13:11:18Z VendorInfo=gohugoio git version 2.39.5 go version go1.23.5 linux/arm64 mkdocs 1.6.1 mkdocs-get-deps 0.2.0 mkdocs-git-authors-plugin 0.9.2 mkdocs-git-committers-plugin-2 2.4.1 mkdocs-git-revision-date-localized-plugin 1.3.0 mkdocs-git-revision-date-plugin 0.3.2 mkdocs-glightbox 0.4.0 mkdocs-macros-plugin 1.3.7 mkdocs-material 9.5.50 mkdocs-material-extensions 1.3.1 mkdocs-minify-plugin 0.8.0 mkdocs-redirects 1.2.2 mkdocs-rss-plugin 1.17.1 Signed-off-by: Samir B Amin <sbamin@alumni.bcm.edu>
1 parent 0982a86 commit 9ac27a5

6 files changed

Lines changed: 202 additions & 116 deletions

File tree

‎Dockerfile‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
############################################################
44
## ruby version should be compliant with netlify and github-pages
55
## managed build nodes, https://pages.github.com/versions/
6-
FROM ruby:2.7.6
6+
FROM ruby:3.3.7
77

88
## For questions, visit https:
99
MAINTAINER "Samir B. Amin" <tweet:sbamin; sbamin.com/contact>
1010

1111
## NOTE: installing beta version of mkdocs-material with blog support.
12-
LABEL version="1.5.4" \
13-
mode="sitebuilder-1.5.4" \
12+
LABEL version="1.5.5" \
13+
mode="sitebuilder-1.5.5" \
1414
description="docker image to build jekyll, hugo or mkdocs supported website" \
1515
website="https://github.com/sbamin/sitebuilder" \
1616
issues="https://github.com/sbamin/sitebuilder/issues"
@@ -22,19 +22,28 @@ ARG DEBIAN_FRONTEND=noninteractive
2222
#### Configure locales ####
2323
## https://github.com/jekyll/jekyll/issues/4268
2424
RUN apt-get update && \
25-
apt-get install -y locales && \
25+
apt-get install -y locales python3 python3-venv python3-distutils && \
26+
apt-get install -y software-properties-common && \
2627
dpkg-reconfigure --frontend noninteractive locales && \
2728
locale-gen C.UTF-8 && \
2829
/usr/sbin/update-locale LANG=C.UTF-8 && \
2930
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
30-
locale-gen
31+
locale-gen && \
32+
apt-get clean
3133

3234
## Set default locale
3335
ENV LC_ALL="C.UTF-8"
3436
ENV LANG="en_US.UTF-8"
3537
ENV LANGUAGE="en_US.UTF-8"
36-
ENV myhugo="0.122.0"
37-
ENV mygo="1.22.0"
38+
ENV myhugo="0.141.0"
39+
ENV mygo="1.23.5"
40+
41+
#### Python 3 venv ####
42+
# Create and activate a Python virtual environment
43+
RUN python3 -m venv /opt/venv && \
44+
/opt/venv/bin/pip install --upgrade pip setuptools wheel
45+
46+
ENV PATH="/opt/venv/bin:$PATH"
3847

3948
#### Jekyll ####
4049
## Copy Gemfile ##
@@ -47,21 +56,28 @@ RUN mkdir -p /scratch && \
4756
bundle install && \
4857
mkdir -p /web
4958

59+
#### git ####
60+
RUN apt-get install -y python3-launchpadlib && \
61+
add-apt-repository ppa:git-core/ppa && \
62+
apt-get update && \
63+
apt-get install -y python3-launchpadlib git && \
64+
git --version
65+
5066
#### Hugo, MkDocs, and theme-mkdocs-material ####
5167
## https://github.com/squidfunk/mkdocs-material
5268
## issue with Hash Sum mismatch
5369
RUN rm -rf /var/lib/apt/lists/partial && \
5470
apt-get update -o Acquire::CompressionTypes::Order::=gz && \
55-
apt-get install -y python3-pip git && \
56-
python3 -m pip install --upgrade pip && \
5771
pip3 install --upgrade singledispatch nltk six && \
5872
## force update packages if failed earlier
5973
pip3 install --upgrade singledispatch nltk six && \
6074
pip3 install markdown pygments fontawesome_markdown pymdown-extensions && \
61-
pip3 install 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 mkdocs-git-authors-plugin && \
75+
pip3 install "mkdocs-material[imaging,recommended,git]" && \
76+
pip3 install 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 mkdocs-git-authors-plugin mkdocs-glightbox && \
6277
## force update mkdocs env
78+
pip3 install --upgrade "mkdocs-material[imaging,recommended,git]" && \
6379
pip3 install --upgrade markdown pygments fontawesome_markdown pymdown-extensions && \
64-
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 mkdocs-git-authors-plugin && \
80+
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 mkdocs-git-authors-plugin mkdocs-glightbox && \
6581
git config --global --add safe.directory /web
6682

6783
## install latest hugo extended
@@ -84,7 +100,7 @@ ENV GOPATH="/opt/go"
84100
## to run jekyll related commands
85101
WORKDIR /web
86102

87-
ENV PATH /usr/local/bundle/bin:/usr/local/bundle/gems/bin:/usr/local/go/bin:/opt/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
103+
ENV PATH /opt/venv/bin:/usr/local/bundle/bin:/usr/local/bundle/gems/bin:/usr/local/go/bin:/opt/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
88104

89105
#### expose ports for jekyll, mkdocs, and hugo serve command ####
90106
EXPOSE 4000

‎Dockerfile_arm64‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
############################################################
44
## ruby version should be compliant with netlify and github-pages
55
## managed build nodes, https://pages.github.com/versions/
6-
FROM ruby:2.7.6
6+
FROM ruby:3.3.7
77

88
## For questions, visit https:
99
MAINTAINER "Samir B. Amin" <tweet:sbamin; sbamin.com/contact>
1010

1111
## NOTE: installing beta version of mkdocs-material with blog support.
12-
LABEL version="1.5.4_arm64" \
13-
mode="sitebuilder-1.5.4_arm64" \
12+
LABEL version="1.5.5_arm64" \
13+
mode="sitebuilder-1.5.5_arm64" \
1414
description="docker image to build jekyll, hugo or mkdocs supported website" \
1515
website="https://github.com/sbamin/sitebuilder" \
1616
issues="https://github.com/sbamin/sitebuilder/issues"
@@ -22,19 +22,28 @@ ARG DEBIAN_FRONTEND=noninteractive
2222
#### Configure locales ####
2323
## https://github.com/jekyll/jekyll/issues/4268
2424
RUN apt-get update && \
25-
apt-get install -y locales && \
25+
apt-get install -y locales python3 python3-venv python3-distutils && \
26+
apt-get install -y software-properties-common && \
2627
dpkg-reconfigure --frontend noninteractive locales && \
2728
locale-gen C.UTF-8 && \
2829
/usr/sbin/update-locale LANG=C.UTF-8 && \
2930
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen && \
30-
locale-gen
31+
locale-gen && \
32+
apt-get clean
3133

3234
## Set default locale
3335
ENV LC_ALL="C.UTF-8"
3436
ENV LANG="en_US.UTF-8"
3537
ENV LANGUAGE="en_US.UTF-8"
36-
ENV myhugo="0.122.0"
37-
ENV mygo="1.22.0"
38+
ENV myhugo="0.141.0"
39+
ENV mygo="1.23.5"
40+
41+
#### Python 3 venv ####
42+
# Create and activate a Python virtual environment
43+
RUN python3 -m venv /opt/venv && \
44+
/opt/venv/bin/pip install --upgrade pip setuptools wheel
45+
46+
ENV PATH="/opt/venv/bin:$PATH"
3847

3948
#### Jekyll ####
4049
## Copy Gemfile ##
@@ -47,21 +56,28 @@ RUN mkdir -p /scratch && \
4756
bundle install && \
4857
mkdir -p /web
4958

59+
#### git ####
60+
RUN apt-get install -y python3-launchpadlib && \
61+
add-apt-repository ppa:git-core/ppa && \
62+
apt-get update && \
63+
apt-get install -y python3-launchpadlib git && \
64+
git --version
65+
5066
#### Hugo, MkDocs, and theme-mkdocs-material ####
5167
## https://github.com/squidfunk/mkdocs-material
5268
## issue with Hash Sum mismatch
5369
RUN rm -rf /var/lib/apt/lists/partial && \
5470
apt-get update -o Acquire::CompressionTypes::Order::=gz && \
55-
apt-get install -y python3-pip git && \
56-
python3 -m pip install --upgrade pip && \
5771
pip3 install --upgrade singledispatch nltk six && \
5872
## force update packages if failed earlier
5973
pip3 install --upgrade singledispatch nltk six && \
6074
pip3 install markdown pygments fontawesome_markdown pymdown-extensions && \
61-
pip3 install 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 mkdocs-git-authors-plugin && \
75+
pip3 install "mkdocs-material[imaging,recommended,git]" && \
76+
pip3 install 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 mkdocs-git-authors-plugin mkdocs-glightbox && \
6277
## force update mkdocs env
78+
pip3 install --upgrade "mkdocs-material[imaging,recommended,git]" && \
6379
pip3 install --upgrade markdown pygments fontawesome_markdown pymdown-extensions && \
64-
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 mkdocs-git-authors-plugin && \
80+
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 mkdocs-git-authors-plugin mkdocs-glightbox && \
6581
git config --global --add safe.directory /web
6682

6783
## install latest hugo extended
@@ -84,7 +100,7 @@ ENV GOPATH="/opt/go"
84100
## to run jekyll related commands
85101
WORKDIR /web
86102

87-
ENV PATH /usr/local/bundle/bin:/usr/local/bundle/gems/bin:/usr/local/go/bin:/opt/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
103+
ENV PATH /opt/venv/bin:/usr/local/bundle/bin:/usr/local/bundle/gems/bin:/usr/local/go/bin:/opt/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
88104

89105
#### expose ports for jekyll, mkdocs, and hugo serve command ####
90106
EXPOSE 4000

‎Gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ source 'https://rubygems.org'
22

33
group :sitebuilder do
44
gem 'bundler', '> 1.14'
5-
gem 'github-pages', '>= 228'
6-
gem 'jekyll', '>=3.9.3'
5+
gem 'github-pages', '>= 232'
6+
gem 'jekyll', '>=3.10.0'
77
gem 'jekyll-redirect-from', '>= 0.16.0'
88
gem 'jekyll-mentions', '>= 1.6.0'
99
gem 'jekyll-twitter-plugin'
1010
gem 'ffi', '>= 1.11.1'
11-
gem 'nokogiri', '>= 1.14.1', '< 2.0'
11+
gem 'nokogiri', '>= 1.16.7', '< 2.0'
1212
end

0 commit comments

Comments
 (0)