diff --git a/Dockerfile b/Dockerfile index 8abb569..dc89006 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,16 @@ -FROM python:3.8.3-slim-buster -ARG PELICAN_VERSION=4.2.0 -ARG SOURCE_CODE_PRO_VERSION=3.006R -ARG MATPLOTLIB_VERSION=3.2.1 +FROM python:3.9.4-slim-buster +ARG PELICAN_VERSION=4.6.0 +ARG SOURCE_SANS_VERSION=3.028R +ARG MATPLOTLIB_VERSION=3.4.1 RUN apt update && apt upgrade -y RUN apt install wget unzip fontconfig -y -RUN wget https://github.com/adobe-fonts/source-sans-pro/releases/download/${SOURCE_CODE_PRO_VERSION}/source-sans-pro-${SOURCE_CODE_PRO_VERSION}.zip && \ - unzip source-sans-pro-${SOURCE_CODE_PRO_VERSION}.zip && \ - rm source-sans-pro-${SOURCE_CODE_PRO_VERSION}.zip && \ + +RUN wget https://github.com/adobe-fonts/source-sans/releases/download/${SOURCE_SANS_VERSION}/source-sans-3v028R.zip && \ + unzip source-sans-3v028R.zip -d source-sans && \ + rm source-sans-3v028R.zip && \ mkdir -p /usr/share/fonts/opentype/adobe/ && \ - cp source-sans-pro-${SOURCE_CODE_PRO_VERSION}/OTF/*.otf /usr/share/fonts/opentype/adobe/ && \ - rm -rf source-sans-pro-${SOURCE_CODE_PRO_VERSION} && \ + cp source-sans/OTF/*.otf /usr/share/fonts/opentype/adobe/ && \ + rm -rf source-sans && \ fc-cache -f -v RUN apt install -y \ texlive-base \ diff --git a/README.md b/README.md index 7e6d68f..13b9116 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ docker run --detach \ --name=pelican \ --volume :/site \ --volume pelican_files:/site-generated \ -boonto/pelican:3.8.1-4.2.0 +boonto/pelican:3.9.4-4.6.0 ``` May be used in conjunction with the [nginx](https://hub.docker.com/_/nginx) container to serve the output. ``` @@ -19,4 +19,4 @@ docker run --detach \ --volume pelican_files:/usr/share/nginx/html:ro \ nginx ``` -Also provides `matplotlib`, `latex` and the [Source Code Pro](https://github.com/adobe-fonts/source-code-pro) font for use with the [m.css](https://mcss.mosra.cz/themes/pelican/) Pelican theme. \ No newline at end of file +Also provides `matplotlib`, `latex` and the [Source Sans](https://github.com/adobe-fonts/source-sans) font for use with the [m.css](https://mcss.mosra.cz/themes/pelican/) Pelican theme. \ No newline at end of file