Skip to content

Commit 68dc59a

Browse files
committed
Updated sitebuilder
v1.5.6 ## amd64 jekyll 3.10.0 hugo v0.144.2-098c68fd18f48031a7145bedab30cbaede48858f+extended linux/amd64 BuildDate=2025-02-19T12:17:04Z VendorInfo=gohugoio git version 2.39.5 go version go1.24.0 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.5.0 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.6.5 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.144.2-098c68fd18f48031a7145bedab30cbaede48858f+extended linux/arm64 BuildDate=2025-02-19T12:17:04Z VendorInfo=gohugoio git version 2.39.5 go version go1.24.0 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.5.0 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.6.5 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 9ac27a5 commit 68dc59a

4 files changed

Lines changed: 50 additions & 49 deletions

File tree

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ FROM ruby:3.3.7
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.5" \
13-
mode="sitebuilder-1.5.5" \
12+
LABEL version="1.5.6" \
13+
mode="sitebuilder-1.5.6" \
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"
@@ -35,8 +35,8 @@ RUN apt-get update && \
3535
ENV LC_ALL="C.UTF-8"
3636
ENV LANG="en_US.UTF-8"
3737
ENV LANGUAGE="en_US.UTF-8"
38-
ENV myhugo="0.141.0"
39-
ENV mygo="1.23.5"
38+
ENV myhugo="0.144.2"
39+
ENV mygo="1.24.0"
4040

4141
#### Python 3 venv ####
4242
# Create and activate a Python virtual environment
@@ -83,15 +83,15 @@ RUN rm -rf /var/lib/apt/lists/partial && \
8383
## install latest hugo extended
8484
RUN wget https://github.com/gohugoio/hugo/releases/download/v"${myhugo}"/hugo_extended_"${myhugo}"_linux-amd64.deb && \
8585
apt install ./hugo_extended_"${myhugo}"_linux-amd64.deb -y && \
86-
rm hugo_extended_"${myhugo}"_linux-amd64.deb && \
86+
rm -f hugo_extended_"${myhugo}"_linux-amd64.deb && \
8787
wget https://go.dev/dl/go"${mygo}".linux-amd64.tar.gz && \
8888
tar -C /usr/local -xvzf go"${mygo}".linux-amd64.tar.gz && \
8989
mkdir -p /opt/go/bin && \
9090
chmod 775 /opt/go && \
9191
chmod 775 /opt/go/bin && \
9292
apt-get install -y git && \
9393
apt-get clean && \
94-
rm go"${mygo}".linux-amd64.tar.gz && \
94+
rm -f go"${mygo}".linux-amd64.tar.gz && \
9595
rm -rf /var/lib/apt/lists/*
9696

9797
ENV GOPATH="/opt/go"

Dockerfile_arm64

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ FROM ruby:3.3.7
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.5_arm64" \
13-
mode="sitebuilder-1.5.5_arm64" \
12+
LABEL version="1.5.6_arm64" \
13+
mode="sitebuilder-1.5.6_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"
@@ -35,8 +35,8 @@ RUN apt-get update && \
3535
ENV LC_ALL="C.UTF-8"
3636
ENV LANG="en_US.UTF-8"
3737
ENV LANGUAGE="en_US.UTF-8"
38-
ENV myhugo="0.141.0"
39-
ENV mygo="1.23.5"
38+
ENV myhugo="0.144.2"
39+
ENV mygo="1.24.0"
4040

4141
#### Python 3 venv ####
4242
# Create and activate a Python virtual environment
@@ -83,15 +83,15 @@ RUN rm -rf /var/lib/apt/lists/partial && \
8383
## install latest hugo extended
8484
RUN wget https://github.com/gohugoio/hugo/releases/download/v"${myhugo}"/hugo_extended_"${myhugo}"_linux-arm64.deb && \
8585
apt install ./hugo_extended_"${myhugo}"_linux-arm64.deb -y && \
86-
rm hugo_extended_"${myhugo}"_linux-arm64.deb && \
86+
rm -f hugo_extended_"${myhugo}"_linux-arm64.deb && \
8787
wget https://go.dev/dl/go"${mygo}".linux-arm64.tar.gz && \
8888
tar -C /usr/local -xvzf go"${mygo}".linux-arm64.tar.gz && \
8989
mkdir -p /opt/go/bin && \
9090
chmod 775 /opt/go && \
9191
chmod 775 /opt/go/bin && \
9292
apt-get install -y git && \
9393
apt-get clean && \
94-
rm go"${mygo}".linux-arm64.tar.gz && \
94+
rm -f go"${mygo}".linux-arm64.tar.gz && \
9595
rm -rf /var/lib/apt/lists/*
9696

9797
ENV GOPATH="/opt/go"

Gemfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ GEM
111111
activesupport (>= 2)
112112
nokogiri (>= 1.4)
113113
http_parser.rb (0.8.0)
114-
i18n (1.14.6)
114+
i18n (1.14.7)
115115
concurrent-ruby (~> 1.0)
116116
jekyll (3.10.0)
117117
addressable (~> 2.4)
@@ -224,7 +224,7 @@ GEM
224224
gemoji (>= 3, < 5)
225225
html-pipeline (~> 2.2)
226226
jekyll (>= 3.0, < 5.0)
227-
json (2.9.1)
227+
json (2.10.1)
228228
kramdown (2.4.0)
229229
rexml
230230
kramdown-parser-gfm (1.1.0)
@@ -233,7 +233,7 @@ GEM
233233
listen (3.9.0)
234234
rb-fsevent (~> 0.10, >= 0.10.3)
235235
rb-inotify (~> 0.9, >= 0.9.10)
236-
logger (1.6.5)
236+
logger (1.6.6)
237237
mercenary (0.3.6)
238238
minima (2.5.1)
239239
jekyll (>= 3.5, < 5.0)
@@ -242,21 +242,21 @@ GEM
242242
minitest (5.25.4)
243243
net-http (0.6.0)
244244
uri
245-
nokogiri (1.18.1-aarch64-linux-gnu)
245+
nokogiri (1.18.3-aarch64-linux-gnu)
246246
racc (~> 1.4)
247-
nokogiri (1.18.1-aarch64-linux-musl)
247+
nokogiri (1.18.3-aarch64-linux-musl)
248248
racc (~> 1.4)
249-
nokogiri (1.18.1-arm-linux-gnu)
249+
nokogiri (1.18.3-arm-linux-gnu)
250250
racc (~> 1.4)
251-
nokogiri (1.18.1-arm-linux-musl)
251+
nokogiri (1.18.3-arm-linux-musl)
252252
racc (~> 1.4)
253-
nokogiri (1.18.1-arm64-darwin)
253+
nokogiri (1.18.3-arm64-darwin)
254254
racc (~> 1.4)
255-
nokogiri (1.18.1-x86_64-darwin)
255+
nokogiri (1.18.3-x86_64-darwin)
256256
racc (~> 1.4)
257-
nokogiri (1.18.1-x86_64-linux-gnu)
257+
nokogiri (1.18.3-x86_64-linux-gnu)
258258
racc (~> 1.4)
259-
nokogiri (1.18.1-x86_64-linux-musl)
259+
nokogiri (1.18.3-x86_64-linux-musl)
260260
racc (~> 1.4)
261261
octokit (4.25.1)
262262
faraday (>= 1, < 3)
@@ -268,7 +268,7 @@ GEM
268268
rb-fsevent (0.11.2)
269269
rb-inotify (0.11.1)
270270
ffi (~> 1.0)
271-
rexml (3.4.0)
271+
rexml (3.4.1)
272272
rouge (3.30.0)
273273
rubyzip (2.4.1)
274274
safe_yaml (1.0.5)

update_sitebuilder.md

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ 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.5.5` 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.5.6` 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

2020
* 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 *myhugo* ENV variable in `Dockerfile`. Optionally, [update related go version](https://go.dev/doc/install) with *mygo* ENV variable.
2121

@@ -27,15 +27,15 @@ git status
2727

2828
```sh
2929
## build amd64 version first
30-
docker build --platform linux/amd64 -f Dockerfile -t sbamin/sitebuilder:1.5.5 .
30+
docker build --platform linux/amd64 -f Dockerfile -t sbamin/sitebuilder:1.5.6 .
3131
```
3232

3333
>NOTE: If using docker on Mac M1/M2, you should add `--platform linux/amd64` given sitebuilder docker image is configured for amd64 and not arm64 architecture. To use arm64 architecture, you need to update `Dockerfile` to replace `amd64` packages with `arm64` ones, if available from a respective developer. [See relevant details here](https://stackoverflow.com/a/68004485/1243763).
3434
3535
* Optional: To build arm64 docker image, use a separate Dockerfile that installs arm64 packages of hugo and go.
3636

3737
```sh
38-
docker build --platform linux/arm64 -f Dockerfile_arm64 -t sbamin/sitebuilder:1.5.5_arm64 .
38+
docker build --platform linux/arm64 -f Dockerfile_arm64 -t sbamin/sitebuilder:1.5.6_arm64 .
3939
```
4040

4141
PS: Rest of steps are implied for amd64 image, and can be followed for arm64 image too with applicable changes to docker image name.
@@ -45,7 +45,7 @@ PS: Rest of steps are implied for amd64 image, and can be followed for arm64 ima
4545
```sh
4646
## start container in an interactive session and mount local (host) directory
4747
## to an empty location in the docker container.
48-
docker run --platform linux/amd64 --rm -it -v "$(pwd)":/hostspace sbamin/sitebuilder:1.5.5 /bin/bash
48+
docker run --platform linux/amd64 --rm -it -v "$(pwd)":/hostspace sbamin/sitebuilder:1.5.6 /bin/bash
4949

5050
## copy (overwrite) local Gemfile.lock with an updated version from
5151
## the container
@@ -58,9 +58,9 @@ exit
5858
* Check installed or updated package versions
5959

6060
```sh
61-
docker run --platform linux/amd64 --rm sbamin/sitebuilder:1.5.5 /bin/bash -c "jekyll --version && hugo version && git version && go version && pip list | grep mkdocs"
61+
docker run --platform linux/amd64 --rm sbamin/sitebuilder:1.5.6 /bin/bash -c "jekyll --version && hugo version && git version && go version && pip list | grep mkdocs"
6262

63-
docker run --platform linux/arm64 --rm sbamin/sitebuilder:1.5.5_arm64 /bin/bash -c "jekyll --version && hugo version && git version && go version && pip list | grep mkdocs"
63+
docker run --platform linux/arm64 --rm sbamin/sitebuilder:1.5.6_arm64 /bin/bash -c "jekyll --version && hugo version && git version && go version && pip list | grep mkdocs"
6464
```
6565

6666
* Commit and push those to github.
@@ -72,23 +72,23 @@ git add Dockerfile Dockerfile_arm64 Gemfile Gemfile.lock update_sitebuilder.md R
7272
## -s requires a valid gpg key for signing a message
7373
git commit -s -F- <<EOF
7474
Updated sitebuilder
75-
v1.5.5
75+
v1.5.6
7676
7777
## amd64
7878
7979
jekyll 3.10.0
80-
hugo v0.141.0-e7bd51698e5c3778a86003018702b1a7dcb9559a+extended linux/amd64 BuildDate=2025-01-16T13:11:18Z VendorInfo=gohugoio
80+
hugo v0.144.2-098c68fd18f48031a7145bedab30cbaede48858f+extended linux/amd64 BuildDate=2025-02-19T12:17:04Z VendorInfo=gohugoio
8181
git version 2.39.5
82-
go version go1.23.5 linux/amd64
82+
go version go1.24.0 linux/amd64
8383
mkdocs 1.6.1
8484
mkdocs-get-deps 0.2.0
8585
mkdocs-git-authors-plugin 0.9.2
86-
mkdocs-git-committers-plugin-2 2.4.1
86+
mkdocs-git-committers-plugin-2 2.5.0
8787
mkdocs-git-revision-date-localized-plugin 1.3.0
8888
mkdocs-git-revision-date-plugin 0.3.2
8989
mkdocs-glightbox 0.4.0
9090
mkdocs-macros-plugin 1.3.7
91-
mkdocs-material 9.5.50
91+
mkdocs-material 9.6.5
9292
mkdocs-material-extensions 1.3.1
9393
mkdocs-minify-plugin 0.8.0
9494
mkdocs-redirects 1.2.2
@@ -97,18 +97,18 @@ mkdocs-rss-plugin 1.17.1
9797
## arm64
9898
9999
jekyll 3.10.0
100-
hugo v0.141.0-e7bd51698e5c3778a86003018702b1a7dcb9559a+extended linux/arm64 BuildDate=2025-01-16T13:11:18Z VendorInfo=gohugoio
100+
hugo v0.144.2-098c68fd18f48031a7145bedab30cbaede48858f+extended linux/arm64 BuildDate=2025-02-19T12:17:04Z VendorInfo=gohugoio
101101
git version 2.39.5
102-
go version go1.23.5 linux/arm64
102+
go version go1.24.0 linux/arm64
103103
mkdocs 1.6.1
104104
mkdocs-get-deps 0.2.0
105105
mkdocs-git-authors-plugin 0.9.2
106-
mkdocs-git-committers-plugin-2 2.4.1
106+
mkdocs-git-committers-plugin-2 2.5.0
107107
mkdocs-git-revision-date-localized-plugin 1.3.0
108108
mkdocs-git-revision-date-plugin 0.3.2
109109
mkdocs-glightbox 0.4.0
110110
mkdocs-macros-plugin 1.3.7
111-
mkdocs-material 9.5.50
111+
mkdocs-material 9.6.5
112112
mkdocs-material-extensions 1.3.1
113113
mkdocs-minify-plugin 0.8.0
114114
mkdocs-redirects 1.2.2
@@ -123,21 +123,22 @@ git push
123123

124124
Upload your docker image to [docker hub](https://www.docker.com), [github packages](https://github.com/features/packages), or your preferred container hub.
125125

126-
* Tag or alias updated image to `latest`. This will overwrite existing alias to `latest` which is typically an older image, e.g., 1.5.1
126+
* Tag or alias updated image to `latest`. This will overwrite existing alias to `latest` which is typically an older image, e.g., 1.x.x
127127

128128
```sh
129129
## unless beta version, remove older docker image tagged as latest, if any on local computer.
130130
docker rmi sbamin/sitebuilder:latest
131-
docker tag sbamin/sitebuilder:1.5.5 sbamin/sitebuilder:latest
131+
docker tag sbamin/sitebuilder:1.5.6 sbamin/sitebuilder:latest
132132
```
133133

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

136136
```sh
137137
## unless beta version, remove older versions
138138
docker rmi ghcr.io/sbamin/sitebuilder:latest
139-
docker tag sbamin/sitebuilder:1.5.5 ghcr.io/sbamin/sitebuilder:1.5.5
140-
docker tag ghcr.io/sbamin/sitebuilder:1.5.5 ghcr.io/sbamin/sitebuilder:latest
139+
docker tag sbamin/sitebuilder:1.5.6 ghcr.io/sbamin/sitebuilder:1.5.6
140+
docker tag ghcr.io/sbamin/sitebuilder:1.5.6 ghcr.io/sbamin/sitebuilder:latest
141+
docker tag sbamin/sitebuilder:1.5.6_arm64 ghcr.io/sbamin/sitebuilder:1.5.6_arm64
141142
```
142143

143144
* Confirm using `docker images` that IMAGE ID of a built image, `sbamin/sitebuilder:1.5.x` matches with aliases created above. If all good, remove previous version of sitebuilder, `docker rmi sbamin/sitebuilder:1.5.4`
@@ -147,9 +148,9 @@ docker tag ghcr.io/sbamin/sitebuilder:1.5.5 ghcr.io/sbamin/sitebuilder:latest
147148
* 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.
148149

149150
```sh
150-
docker push sbamin/sitebuilder:1.5.5
151+
docker push sbamin/sitebuilder:1.5.6
151152
docker push sbamin/sitebuilder:latest
152-
docker push sbamin/sitebuilder:1.5.5_arm64
153+
docker push sbamin/sitebuilder:1.5.6_arm64
153154
```
154155

155156
* If using github container repo, this should work.
@@ -160,9 +161,9 @@ docker push sbamin/sitebuilder:1.5.5_arm64
160161
## avoid echo raw password!
161162
## echo $(<decrypt pwd>) | docker login ghcr.io -u USERNAME --password-stdin
162163

163-
docker push ghcr.io/sbamin/sitebuilder:1.5.5
164+
docker push ghcr.io/sbamin/sitebuilder:1.5.6
164165
docker push ghcr.io/sbamin/sitebuilder:latest
165-
docker push ghcr.io/sbamin/sitebuilder:1.5.5_arm64
166+
docker push ghcr.io/sbamin/sitebuilder:1.5.6_arm64
166167
```
167168

168169
### Get singularity SIF image
@@ -172,8 +173,8 @@ If you prefer using [singularity](https://docs.sylabs.io/guides/3.5/user-guide/s
172173
```sh
173174
## assuming running on linux/amd64 architecture.
174175
singularity run docker://sbamin/sitebuilder:latest
175-
## or beta version
176-
singularity run docker://sbamin/sitebuilder:1.5.5
176+
## or a specific version
177+
singularity run docker://sbamin/sitebuilder:1.5.6
177178
```
178179

179180
Done!

0 commit comments

Comments
 (0)