Skip to content

update: installing foliant from PyPi and updating dependencies #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holamgadol merged 4 commits into from
Feb 25, 2026
Merged

update: installing foliant from PyPi and updating dependencies #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10d8bd4
update: build from pipy and master branch
TOsmanov Feb 25, 2026
e3d5710
remove: unnecessary
TOsmanov Feb 25, 2026
ed7d00f
enable: push latest tags
TOsmanov Feb 25, 2026
68889b2
bump requirements
TOsmanov Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Dockerfile-full
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-pandoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 1 addition & 5 deletions Dockerfile-slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ 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 \
&& apt-get install -y locales \
Expand Down
7 changes: 3 additions & 4 deletions build_full.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,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
7 changes: 3 additions & 4 deletions build_latest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,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
7 changes: 3 additions & 4 deletions build_pandoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,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
7 changes: 3 additions & 4 deletions build_slim.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,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
4 changes: 2 additions & 2 deletions dependency_files/python_packages/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading