From 10d8bd4854f61c8151f65a41e808f68ee4194a26 Mon Sep 17 00:00:00 2001 From: Timur Osmanov Date: Wed, 25 Feb 2026 14:41:31 +0300 Subject: [PATCH 1/4] update: build from pipy and master branch --- Dockerfile-slim | 10 ++++++---- build_full.sh | 3 +-- build_latest.sh | 3 +-- build_pandoc.sh | 3 +-- build_slim.sh | 3 +-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Dockerfile-slim b/Dockerfile-slim index 36274b3..a7c8a0e 100644 --- a/Dockerfile-slim +++ b/Dockerfile-slim @@ -19,10 +19,12 @@ RUN apt-get update \ RUN pip3 install poetry==2.1.1 # TODO: make install from PyPi -RUN git clone -b add-partial-copy https://github.com/foliant-docs/foliant.git \ - && cd foliant \ - && poetry build --format=wheel \ - && pip3 install dist/*.whl +# RUN git clone -b add-partial-copy https://github.com/foliant-docs/foliant.git \ +# && cd foliant \ +# && poetry build --format=wheel \ +# && pip3 install dist/*.whl + +RUN pip3 install foliant>=$VERSION RUN apt-get update \ && apt-get install -y locales \ diff --git a/build_full.sh b/build_full.sh index d1dbc0c..e8e646d 100755 --- a/build_full.sh +++ b/build_full.sh @@ -9,8 +9,7 @@ else fi if [ ! $1 ] ; then - # TODO: switch add-partial-copy to master - FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/add-partial-copy/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` else FOLIANT_VERSION=$1 fi diff --git a/build_latest.sh b/build_latest.sh index 3a36930..d99fdf8 100755 --- a/build_latest.sh +++ b/build_latest.sh @@ -9,8 +9,7 @@ else fi if [ ! $1 ] ; then - # TODO: switch add-partial-copy to master - FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/add-partial-copy/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` else FOLIANT_VERSION=$1 fi diff --git a/build_pandoc.sh b/build_pandoc.sh index 59d2ad3..f8621d7 100755 --- a/build_pandoc.sh +++ b/build_pandoc.sh @@ -9,8 +9,7 @@ else fi if [ ! $1 ] ; then - # TODO: switch add-partial-copy to master - FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/add-partial-copy/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` else FOLIANT_VERSION=$1 fi diff --git a/build_slim.sh b/build_slim.sh index 0e281ab..955358c 100755 --- a/build_slim.sh +++ b/build_slim.sh @@ -9,8 +9,7 @@ else fi if [ ! $1 ] ; then - # TODO: switch add-partial-copy to master - FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/add-partial-copy/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` + FOLIANT_VERSION=`curl https://raw.githubusercontent.com/foliant-docs/foliant/master/foliant/__init__.py | grep -${grep_option}o "\d+\.\d+\.\d+"` else FOLIANT_VERSION=$1 fi From e3d57102b7f0b2be3a07d5f062313a9bf6715ecd Mon Sep 17 00:00:00 2001 From: Timur Osmanov Date: Wed, 25 Feb 2026 15:13:08 +0300 Subject: [PATCH 2/4] remove: unnecessary --- Dockerfile-slim | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile-slim b/Dockerfile-slim index a7c8a0e..e3d542c 100644 --- a/Dockerfile-slim +++ b/Dockerfile-slim @@ -18,12 +18,6 @@ RUN apt-get update \ RUN pip3 install poetry==2.1.1 -# TODO: make install from PyPi -# RUN git clone -b add-partial-copy https://github.com/foliant-docs/foliant.git \ -# && cd foliant \ -# && poetry build --format=wheel \ -# && pip3 install dist/*.whl - RUN pip3 install foliant>=$VERSION RUN apt-get update \ From ed7d00fa4b82640f3b3fb7c70737de2c78452a2c Mon Sep 17 00:00:00 2001 From: Timur Osmanov Date: Wed, 25 Feb 2026 18:28:07 +0300 Subject: [PATCH 3/4] enable: push latest tags --- Dockerfile | 2 +- Dockerfile-full | 2 +- Dockerfile-pandoc | 2 +- build_full.sh | 4 ++-- build_latest.sh | 4 ++-- build_pandoc.sh | 4 ++-- build_slim.sh | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48efc0d..6136f88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM ghcr.io/foliant-docs/foliant/foliant:1.0.14-slim +FROM ghcr.io/foliant-docs/foliant/foliant:slim RUN pip3 install foliantcontrib.init diff --git a/Dockerfile-full b/Dockerfile-full index 716c653..08390e0 100644 --- a/Dockerfile-full +++ b/Dockerfile-full @@ -1,4 +1,4 @@ -FROM ghcr.io/foliant-docs/foliant/foliant:1.0.14-pandoc +FROM ghcr.io/foliant-docs/foliant/foliant:pandoc RUN apt update \ && apt install --reinstall ca-certificates \ diff --git a/Dockerfile-pandoc b/Dockerfile-pandoc index e278de6..565e9cb 100644 --- a/Dockerfile-pandoc +++ b/Dockerfile-pandoc @@ -1,5 +1,5 @@ # TODO: uncomment -FROM ghcr.io/foliant-docs/foliant/foliant:1.0.14 +FROM ghcr.io/foliant-docs/foliant/foliant RUN apt update && apt install -y wget texlive-full librsvg2-bin diff --git a/build_full.sh b/build_full.sh index e8e646d..fccb984 100755 --- a/build_full.sh +++ b/build_full.sh @@ -27,8 +27,8 @@ docker pull $GITHUB_REGISTRY_URL/$ORGANIZATION/$BASE_DOCKER_IMAGE docker pull $GITHUB_REGISTRY_URL/$ORGANIZATION/$BASE_DOCKER_IMAGE_NUMBERED_TAG docker login $GITHUB_REGISTRY_URL docker build --no-cache -t $DOCKER_IMAGE_TAG -t $DOCKER_IMAGE_NUMBERED_TAG -f Dockerfile-full ./ 2>&1 | tee ./build.log -# docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG -# docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG docker tag $DOCKER_IMAGE_NUMBERED_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker logout $GITHUB_REGISTRY_URL diff --git a/build_latest.sh b/build_latest.sh index d99fdf8..697f504 100755 --- a/build_latest.sh +++ b/build_latest.sh @@ -27,8 +27,8 @@ docker pull $GITHUB_REGISTRY_URL/$ORGANIZATION/$BASE_DOCKER_IMAGE docker pull $GITHUB_REGISTRY_URL/$ORGANIZATION/$BASE_DOCKER_IMAGE_NUMBERED_TAG docker login $GITHUB_REGISTRY_URL docker build --no-cache -t $DOCKER_IMAGE_TAG -t $DOCKER_IMAGE_NUMBERED_TAG -f Dockerfile ./ 2>&1 | tee ./build.log -# docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG -# docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG docker tag $DOCKER_IMAGE_NUMBERED_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker logout $GITHUB_REGISTRY_URL diff --git a/build_pandoc.sh b/build_pandoc.sh index f8621d7..ee16c18 100755 --- a/build_pandoc.sh +++ b/build_pandoc.sh @@ -27,8 +27,8 @@ docker pull $GITHUB_REGISTRY_URL/$ORGANIZATION/$BASE_DOCKER_IMAGE docker pull $GITHUB_REGISTRY_URL/$ORGANIZATION/$BASE_DOCKER_IMAGE_NUMBERED_TAG docker login $GITHUB_REGISTRY_URL docker build --no-cache -t $DOCKER_IMAGE_TAG -t $DOCKER_IMAGE_NUMBERED_TAG -f Dockerfile-pandoc ./ 2>&1 | tee ./build.log -# docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG -# docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG docker tag $DOCKER_IMAGE_NUMBERED_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker logout $GITHUB_REGISTRY_URL diff --git a/build_slim.sh b/build_slim.sh index 955358c..bbaaea4 100755 --- a/build_slim.sh +++ b/build_slim.sh @@ -24,8 +24,8 @@ ORGANIZATION=foliant-docs docker pull ubuntu:focal docker login $GITHUB_REGISTRY_URL docker build --no-cache --build-arg VERSION=${FOLIANT_VERSION} -t $DOCKER_IMAGE_TAG -t $DOCKER_IMAGE_NUMBERED_TAG -f Dockerfile-slim ./ 2>&1 | tee ./build.log -# docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG -# docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker tag $DOCKER_IMAGE_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG +docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_TAG docker tag $DOCKER_IMAGE_NUMBERED_TAG $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker push $GITHUB_REGISTRY_URL/$ORGANIZATION/$DOCKER_IMAGE_NUMBERED_TAG docker logout $GITHUB_REGISTRY_URL From 68889b204ffcea4a7db6070adb183b0c5110f228 Mon Sep 17 00:00:00 2001 From: Timur Osmanov Date: Wed, 25 Feb 2026 19:09:45 +0300 Subject: [PATCH 4/4] bump requirements --- dependency_files/python_packages/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency_files/python_packages/requirements.txt b/dependency_files/python_packages/requirements.txt index ae0d8f4..86e8f95 100644 --- a/dependency_files/python_packages/requirements.txt +++ b/dependency_files/python_packages/requirements.txt @@ -40,7 +40,7 @@ foliantcontrib.meta >= 1.3.3 foliantcontrib.metagraph >= 0.1.3 foliantcontrib.mkdocs >= 1.0.15 foliantcontrib.multilinetables >= 1.2.3 -foliantcontrib.multiproject >= 1.0.16 +foliantcontrib.multiproject >= 1.0.17 foliantcontrib.notifier >= 1.0.0 foliantcontrib.pandoc >= 1.1.1 foliantcontrib.pgsqldoc >= 1.1.7 @@ -50,7 +50,7 @@ foliantcontrib.reindexer >= 1.0.1 foliantcontrib.removeexcess >= 1.0.0 foliantcontrib.replace >= 2.0.0 foliantcontrib.runcommands >= 1.0.1 -foliantcontrib.showcommits >= 1.0.5 +foliantcontrib.showcommits >= 1.0.6 foliantcontrib.slate >= 1.0.10 foliantcontrib.slugs >= 1.0.1 foliantcontrib.subset >= 1.0.9